From f9e706a9aed9100010264e5e9d370bb548ead5f6 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 26 Aug 2023 20:59:12 -0400 Subject: [PATCH 1/7] [pom] Remove attach self from argline --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 265d65d0..c3478aad 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 1.0.4 3.1.3 - -Djdk.attach.allowAttachSelf --add-opens java.base/java.lang=ALL-UNNAMED -Dfile.encoding=UTF-8 + --add-opens java.base/java.lang=ALL-UNNAMED -Dfile.encoding=UTF-8 1684572441 From f475ae54355cddf82aaf42bfeea049b07a7ffb24 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 26 Aug 2023 21:08:35 -0400 Subject: [PATCH 2/7] [ci] Formatting --- .../src/site/markdown/index.md | 2 +- .../src/site/zh/markdown/index.md | 2 +- .../sample/mybatis/groovy/domain/City.groovy | 4 +- .../mybatis/groovy/mapper/CityMapper.groovy | 6 +- .../groovy/CaptureSystemOutput.groovy | 66 +++++++++---------- .../groovy/mapper/CityMapperTest.groovy | 8 +-- .../sample/mybatis/xml/mapper/CityMapper.java | 2 +- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md b/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md index 2e8dc94e..47e0dff3 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md +++ b/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md @@ -294,7 +294,7 @@ public class MyBatisConfig { properties.put("H2", "h2"); databaseIdProvider.setProperties(properties); return databaseIdProvider; - } + } } ``` diff --git a/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md b/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md index 3928f558..77b4f767 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md +++ b/mybatis-spring-boot-autoconfigure/src/site/zh/markdown/index.md @@ -293,7 +293,7 @@ public class MyBatisConfig { properties.put("H2", "h2"); databaseIdProvider.setProperties(properties); return databaseIdProvider; - } + } } ``` diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/domain/City.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/domain/City.groovy index 4ea0fb5d..45ac07b0 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/domain/City.groovy +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/domain/City.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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. @@ -21,7 +21,7 @@ class City { String name String state String country - + @Override String toString() { return "${id},${name},${state},${country}" diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/mapper/CityMapper.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/mapper/CityMapper.groovy index 8a8af0c7..48f59544 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/mapper/CityMapper.groovy +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/mapper/CityMapper.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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. @@ -33,5 +33,5 @@ interface CityMapper { state = #{state} ''') City findByState(@Param("state") String state) - -} \ No newline at end of file + +} diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy index d9a980a3..30b72f73 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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. @@ -82,18 +82,18 @@ import static org.hamcrest.Matchers.allOf @Retention(RUNTIME) @ExtendWith(CaptureSystemOutput.Extension.class) @interface CaptureSystemOutput { - + class Extension implements BeforeAllCallback, AfterAllCallback, AfterEachCallback, ParameterResolver { - + @Override void beforeAll(ExtensionContext context) { getOutputCapture(context).captureOutput() } - + void afterAll(ExtensionContext context) { getOutputCapture(context).releaseOutput() } - + @Override void afterEach(ExtensionContext context) { OutputCapture outputCapture = getOutputCapture(context) @@ -106,33 +106,33 @@ import static org.hamcrest.Matchers.allOf outputCapture.reset() } } - + @Override boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { boolean isTestMethodLevel = extensionContext.getTestMethod().isPresent() boolean isOutputCapture = parameterContext.getParameter().getType() == OutputCapture.class return isTestMethodLevel && isOutputCapture } - + @Override Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { return getOutputCapture(extensionContext) } - + private OutputCapture getOutputCapture(ExtensionContext context) { return getOrComputeIfAbsent(getStore(context), OutputCapture.class) } - + private V getOrComputeIfAbsent(Store store, Class type) { return store.getOrComputeIfAbsent(type, {x -> ReflectionSupport.newInstance(x)}, type) } - + private Store getStore(ExtensionContext context) { return context.getStore(Namespace.create(getClass())) } - + } - + /** * {@code OutputCapture} captures output to {@code System.out} and {@code System.err}. * @@ -151,15 +151,15 @@ import static org.hamcrest.Matchers.allOf * @author Sam Brannen */ static class OutputCapture { - + private final List> matchers = new ArrayList<>() - + private CaptureOutputStream captureOut - + private CaptureOutputStream captureErr - + private ByteArrayOutputStream copy - + void captureOutput() { this.copy = new ByteArrayOutputStream() this.captureOut = new CaptureOutputStream(System.out, this.copy) @@ -167,7 +167,7 @@ import static org.hamcrest.Matchers.allOf System.setOut(new PrintStream(this.captureOut)) System.setErr(new PrintStream(this.captureErr)) } - + void releaseOutput() { System.setOut(this.captureOut.getOriginal()) System.setErr(this.captureErr.getOriginal()) @@ -182,7 +182,7 @@ import static org.hamcrest.Matchers.allOf // ignore } } - + /** * Verify that the captured output is matched by the supplied {@code matcher}. * @@ -195,7 +195,7 @@ import static org.hamcrest.Matchers.allOf void expect(Matcher matcher) { this.matchers.add(matcher) } - + /** * Return all captured output to {@code System.out} and {@code System.err} as a single string. */ @@ -204,53 +204,53 @@ import static org.hamcrest.Matchers.allOf flush() return this.copy.toString() } - + void reset() { this.matchers.clear() this.copy.reset() } - + private static class CaptureOutputStream extends OutputStream { - + private final PrintStream original - + private final OutputStream copy - + CaptureOutputStream(PrintStream original, OutputStream copy) { this.original = original this.copy = copy } - + PrintStream getOriginal() { return this.original } - + @Override void write(int b) throws IOException { this.copy.write(b) this.original.write(b) this.original.flush() } - + @Override void write(byte[] b) throws IOException { write(b, 0, b.length) } - + @Override void write(byte[] b, int off, int len) throws IOException { this.copy.write(b, off, len) this.original.write(b, off, len) } - + @Override void flush() throws IOException { this.copy.flush() this.original.flush() } - + } - + } - + } diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/CityMapperTest.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/CityMapperTest.groovy index 38a72fe9..e3b10eca 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/CityMapperTest.groovy +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/CityMapperTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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. @@ -21,10 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired @MybatisTest class CityMapperTest { - + @Autowired CityMapper cityMapper - + @Test void findByState() { def city = cityMapper.findByState("CA"); @@ -33,5 +33,5 @@ class CityMapperTest { assert city.state == "CA" assert city.country == "US" } - + } diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/CityMapper.java index 3f2a5303..45671021 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/CityMapper.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/CityMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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. From d219beae328fd1a8aca7dafc81585d77a3b7259a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 26 Aug 2023 21:09:16 -0400 Subject: [PATCH 3/7] [charset] Use charsets directly in this code line as newer jdk --- .../mybatis/spring/boot/autoconfigure/SpringBootVFS.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/SpringBootVFS.java b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/SpringBootVFS.java index 7bd3dfc3..51ba40a0 100644 --- a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/SpringBootVFS.java +++ b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/SpringBootVFS.java @@ -59,7 +59,7 @@ public boolean isValid() { @Override protected List list(URL url, String path) throws IOException { - String urlString = URLDecoder.decode(url.toString(), urlDecodingCharset.name()); + String urlString = URLDecoder.decode(url.toString(), urlDecodingCharset); String baseUrlString = urlString.endsWith("/") ? urlString : urlString.concat("/"); Resource[] resources = resourceResolver.getResources(baseUrlString + "**/*.class"); return Stream.of(resources).map(resource -> preserveSubpackageName(baseUrlString, resource, path)) @@ -99,9 +99,10 @@ public static void setClassLoaderSupplier(Supplier supplier) { private static String preserveSubpackageName(final String baseUrlString, final Resource resource, final String rootPath) { try { - return rootPath + (rootPath.endsWith("/") ? "" : "/") + Normalizer - .normalize(URLDecoder.decode(resource.getURL().toString(), urlDecodingCharset.name()), Normalizer.Form.NFC) - .substring(baseUrlString.length()); + return rootPath + (rootPath.endsWith("/") ? "" : "/") + + Normalizer + .normalize(URLDecoder.decode(resource.getURL().toString(), urlDecodingCharset), Normalizer.Form.NFC) + .substring(baseUrlString.length()); } catch (IOException e) { throw new UncheckedIOException(e); } From bd488661298c9a8218f9048265eabf2d93cae977 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 26 Aug 2023 21:10:17 -0400 Subject: [PATCH 4/7] [mvn] Update maven wrapper --- .mvn/extensions.xml | 2 +- .mvn/maven.config | 2 + .mvn/settings.xml | 13 +++- .mvn/wrapper/MavenWrapperDownloader.java | 98 ++++++++++++++++++++++++ .mvn/wrapper/maven-wrapper.properties | 2 +- mvnw | 2 +- mvnw.cmd | 2 +- 7 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 .mvn/maven.config create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 2b1cf2cf..e1c7272d 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,7 +1,7 @@ - + ossrh ${env.CI_DEPLOY_USERNAME} ${env.CI_DEPLOY_PASSWORD} + - gh-pages + gh-pages-scm + + branch + gh-pages + github diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..f57fd86f --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,98 @@ +/* + * 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 + * + * https://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. + */ + +import java.io.IOException; +import java.io.InputStream; +import java.net.Authenticator; +import java.net.PasswordAuthentication; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; + +public final class MavenWrapperDownloader +{ + private static final String WRAPPER_VERSION = "3.2.0"; + + private static final boolean VERBOSE = Boolean.parseBoolean( System.getenv( "MVNW_VERBOSE" ) ); + + public static void main( String[] args ) + { + log( "Apache Maven Wrapper Downloader " + WRAPPER_VERSION ); + + if ( args.length != 2 ) + { + System.err.println( " - ERROR wrapperUrl or wrapperJarPath parameter missing" ); + System.exit( 1 ); + } + + try + { + log( " - Downloader started" ); + final URL wrapperUrl = new URL( args[0] ); + final String jarPath = args[1].replace( "..", "" ); // Sanitize path + final Path wrapperJarPath = Paths.get( jarPath ).toAbsolutePath().normalize(); + downloadFileFromURL( wrapperUrl, wrapperJarPath ); + log( "Done" ); + } + catch ( IOException e ) + { + System.err.println( "- Error downloading: " + e.getMessage() ); + if ( VERBOSE ) + { + e.printStackTrace(); + } + System.exit( 1 ); + } + } + + private static void downloadFileFromURL( URL wrapperUrl, Path wrapperJarPath ) + throws IOException + { + log( " - Downloading to: " + wrapperJarPath ); + if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null ) + { + final String username = System.getenv( "MVNW_USERNAME" ); + final char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray(); + Authenticator.setDefault( new Authenticator() + { + @Override + protected PasswordAuthentication getPasswordAuthentication() + { + return new PasswordAuthentication( username, password ); + } + } ); + } + try ( InputStream inStream = wrapperUrl.openStream() ) + { + Files.copy( inStream, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING ); + } + log( " - Downloader complete" ); + } + + private static void log( String msg ) + { + if ( VERBOSE ) + { + System.out.println( msg ); + } + } + +} diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index ac184013..3267ebce 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -6,7 +6,7 @@ # "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 +# https://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 diff --git a/mvnw b/mvnw index 8d937f4c..66df2854 100755 --- a/mvnw +++ b/mvnw @@ -8,7 +8,7 @@ # "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 +# https://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 diff --git a/mvnw.cmd b/mvnw.cmd index c4586b56..95ba6f54 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -7,7 +7,7 @@ @REM "License"); you may not use this file except in compliance @REM with the License. You may obtain a copy of the License at @REM -@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM https://www.apache.org/licenses/LICENSE-2.0 @REM @REM Unless required by applicable law or agreed to in writing, @REM software distributed under the License is distributed on an From 722e3ba037ec9c276591957cfd567f72eea24399 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 26 Aug 2023 21:17:55 -0400 Subject: [PATCH 5/7] [eol] Fix end of file markers --- .gitattributes | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../src/site/resources/css/site.css | 2 +- .../src/site/resources/es/css/site.css | 2 +- .../src/site/resources/ja/css/site.css | 2 +- .../src/site/resources/ko/css/site.css | 2 +- .../src/site/resources/zh/css/site.css | 2 +- .../src/test/resources/db/changelog/db.changelog-override.sql | 2 +- .../src/test/resources/logback-test.xml | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt | 2 +- .../src/main/kotlin/sample/mybatis/kotlin/domain/City.kt | 2 +- .../src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt | 2 +- .../sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt | 2 +- .../sample/mybatis/kotlin/SampleMybatisApplicationTest.kt | 2 +- .../sample/mybatis/kotlin/mapper/MapperTestApplication.kt | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/mappers/CityMapper-findByCountry.sql | 2 +- .../src/main/resources/mappers/CityMapper-findByState.sql | 2 +- .../src/main/resources/mappers/CityMapper-findByState.vm | 2 +- .../src/main/resources/mappers/CityMapper-findByState.vm | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/java/sample/mybatis/xml/domain/Hotel.java | 2 +- .../src/main/resources/application.properties | 2 +- mybatis-spring-boot-starter-test/pom.xml | 2 +- mybatis-spring-boot-test-autoconfigure/pom.xml | 2 +- .../src/site/resources/css/site.css | 2 +- .../src/site/resources/es/css/site.css | 2 +- .../src/site/resources/ja/css/site.css | 2 +- .../src/site/resources/ko/css/site.css | 2 +- .../src/site/resources/zh/css/site.css | 2 +- mybatis-spring-boot-test-autoconfigure/src/site/site_zh.xml | 2 +- .../org/mybatis/spring/boot/test/autoconfigure/SampleMapper.xml | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.gitattributes b/.gitattributes index 21256661..176a458f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -* text=auto \ No newline at end of file +* text=auto diff --git a/mybatis-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/mybatis-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index 6b67dd18..38ed9cd7 100644 --- a/mybatis-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/mybatis-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -16,4 +16,4 @@ # Depends On Database Initialization Detectors org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitializationDetector=\ -org.mybatis.spring.boot.autoconfigure.MybatisDependsOnDatabaseInitializationDetector \ No newline at end of file +org.mybatis.spring.boot.autoconfigure.MybatisDependsOnDatabaseInitializationDetector diff --git a/mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css index 298b451d..b711d26e 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../images/en.png') left no-repeat;padding-left: 32px; ma li.es {background: url('../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css index 82e53f64..f4ce27b9 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../../images/en.png') left no-repeat;padding-left: 32px; li.es {background: url('../../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css index 82e53f64..f4ce27b9 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../../images/en.png') left no-repeat;padding-left: 32px; li.es {background: url('../../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css index 82e53f64..f4ce27b9 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../../images/en.png') left no-repeat;padding-left: 32px; li.es {background: url('../../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css index 82e53f64..f4ce27b9 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../../images/en.png') left no-repeat;padding-left: 32px; li.es {background: url('../../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql b/mybatis-spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql index 2afac912..cd105ca3 100644 --- a/mybatis-spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql +++ b/mybatis-spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql @@ -21,4 +21,4 @@ CREATE TABLE customer ( id int AUTO_INCREMENT NOT NULL PRIMARY KEY, name varchar(50) NOT NULL -); \ No newline at end of file +); diff --git a/mybatis-spring-boot-autoconfigure/src/test/resources/logback-test.xml b/mybatis-spring-boot-autoconfigure/src/test/resources/logback-test.xml index e9eed2e0..14af4d2e 100644 --- a/mybatis-spring-boot-autoconfigure/src/test/resources/logback-test.xml +++ b/mybatis-spring-boot-autoconfigure/src/test/resources/logback-test.xml @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties index 3c747bfb..6716ba1c 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties @@ -15,4 +15,4 @@ # logging.level.root=WARN -logging.level.sample.mybatis.annotation.mapper=TRACE \ No newline at end of file +logging.level.sample.mybatis.annotation.mapper=TRACE diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/application.properties index 950b3f35..a4b78961 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/application.properties +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/application.properties @@ -22,4 +22,4 @@ mybatis.type-aliases-package=sample.mybatis.freemarker.domain mybatis.scripting-language-driver.freemarker.template-file.base-dir=mappers/ mybatis.scripting-language-driver.freemarker.template-file.path-provider.includes-package-path=false -mybatis.scripting-language-driver.freemarker.template-file.path-provider.separate-directory-per-mapper=false \ No newline at end of file +mybatis.scripting-language-driver.freemarker.template-file.path-provider.separate-directory-per-mapper=false diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/resources/application.properties index 0796d2f3..57698497 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/resources/application.properties +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/resources/application.properties @@ -15,4 +15,4 @@ # logging.level.root=WARN -logging.level.sample.mybatis.groovy.mapper=TRACE \ No newline at end of file +logging.level.sample.mybatis.groovy.mapper=TRACE diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt index 5e463bfc..c68a218d 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt @@ -33,4 +33,4 @@ class SampleKotlinApplication (private val cityMapper: CityMapper) : CommandLine fun main(args: Array) { runApplication(*args) -} \ No newline at end of file +} diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/domain/City.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/domain/City.kt index 0c018c0c..6897d422 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/domain/City.kt +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/domain/City.kt @@ -20,4 +20,4 @@ data class City( var name: String? = null, var state: String? = null, var country: String? = null -) \ No newline at end of file +) diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt index f92a7e7b..f981cfca 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt @@ -33,4 +33,4 @@ interface CityMapper { """) fun findByState(@Param("state") state: String): City -} \ No newline at end of file +} diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt index 37a4b44f..56ab2b7d 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt @@ -29,4 +29,4 @@ class SampleMybatisApplicationMainTest { assertThat(output).contains("City(id=1, name=San Francisco, state=CA, country=US)") } -} \ No newline at end of file +} diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationTest.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationTest.kt index 0da7ab8f..118eba81 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationTest.kt +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationTest.kt @@ -30,4 +30,4 @@ class SampleMybatisApplicationTest { assertThat(output).contains("City(id=1, name=San Francisco, state=CA, country=US)") } -} \ No newline at end of file +} diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/MapperTestApplication.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/MapperTestApplication.kt index 1ddf6634..4ab456f2 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/MapperTestApplication.kt +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/MapperTestApplication.kt @@ -18,4 +18,4 @@ package sample.mybatis.kotlin.mapper import org.springframework.boot.autoconfigure.SpringBootApplication @SpringBootApplication -class MapperTestApplication \ No newline at end of file +class MapperTestApplication diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/application.properties index b05dec18..01e967bd 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/application.properties +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/application.properties @@ -22,4 +22,4 @@ mybatis.type-aliases-package=sample.mybatis.thymeleaf.domain mybatis.scripting-language-driver.thymeleaf.template-file.base-dir=mappers/ mybatis.scripting-language-driver.thymeleaf.template-file.path-provider.includes-package-path=false -mybatis.scripting-language-driver.thymeleaf.template-file.path-provider.separate-directory-per-mapper=false \ No newline at end of file +mybatis.scripting-language-driver.thymeleaf.template-file.path-provider.separate-directory-per-mapper=false diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper-findByCountry.sql b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper-findByCountry.sql index 4c0943cd..dd25ad10 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper-findByCountry.sql +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper-findByCountry.sql @@ -19,4 +19,4 @@ select from city where - country = /*[# mb:p="country"]*/ 'US' /*[/]*/ \ No newline at end of file + country = /*[# mb:p="country"]*/ 'US' /*[/]*/ diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper-findByState.sql b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper-findByState.sql index 5e3f0078..73b68950 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper-findByState.sql +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper-findByState.sql @@ -19,4 +19,4 @@ select from city where - state = /*[# mb:p="state"]*/ 'CA' /*[/]*/ \ No newline at end of file + state = /*[# mb:p="state"]*/ 'CA' /*[/]*/ diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/mappers/CityMapper-findByState.vm b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/mappers/CityMapper-findByState.vm index 41f96212..f8e226a8 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/mappers/CityMapper-findByState.vm +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/mappers/CityMapper-findByState.vm @@ -19,4 +19,4 @@ select from city where - state = @{state} \ No newline at end of file + state = @{state} diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/mappers/CityMapper-findByState.vm b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/mappers/CityMapper-findByState.vm index 41f96212..f8e226a8 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/mappers/CityMapper-findByState.vm +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/mappers/CityMapper-findByState.vm @@ -19,4 +19,4 @@ select from city where - state = @{state} \ No newline at end of file + state = @{state} diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/resources/application.properties index 1afc677d..34126ffe 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/resources/application.properties +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/resources/application.properties @@ -18,4 +18,4 @@ server.port=18080 server.servlet.context-path=/mybatis-spring-boot-sample-war logging.level.root=INFO -logging.level.sample.mybatis.war.mapper=TRACE \ No newline at end of file +logging.level.sample.mybatis.war.mapper=TRACE diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/resources/application.properties index 928d4027..c14bc6ab 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/resources/application.properties +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/resources/application.properties @@ -15,4 +15,4 @@ # logging.level.root=INFO -logging.level.sample.mybatis.web.mapper=TRACE \ No newline at end of file +logging.level.sample.mybatis.web.mapper=TRACE diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/Hotel.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/Hotel.java index 9f71da06..e1602251 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/Hotel.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/Hotel.java @@ -69,4 +69,4 @@ public String toString() { return getCity() + "," + getName() + "," + getAddress() + "," + getZip(); } -} \ No newline at end of file +} diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/application.properties index 9a380878..7b2b276c 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/application.properties +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/application.properties @@ -16,4 +16,4 @@ mybatis.config-location=classpath:mybatis-config.xml logging.level.root=WARN -logging.level.sample.mybatis.xml.mapper=TRACE \ No newline at end of file +logging.level.sample.mybatis.xml.mapper=TRACE diff --git a/mybatis-spring-boot-starter-test/pom.xml b/mybatis-spring-boot-starter-test/pom.xml index efad8d28..53a643a8 100644 --- a/mybatis-spring-boot-starter-test/pom.xml +++ b/mybatis-spring-boot-starter-test/pom.xml @@ -38,4 +38,4 @@ mybatis-spring-boot-test-autoconfigure - \ No newline at end of file + diff --git a/mybatis-spring-boot-test-autoconfigure/pom.xml b/mybatis-spring-boot-test-autoconfigure/pom.xml index d39c019b..50fadb65 100644 --- a/mybatis-spring-boot-test-autoconfigure/pom.xml +++ b/mybatis-spring-boot-test-autoconfigure/pom.xml @@ -76,4 +76,4 @@ test - \ No newline at end of file + diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/resources/css/site.css b/mybatis-spring-boot-test-autoconfigure/src/site/resources/css/site.css index 298b451d..b711d26e 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/site/resources/css/site.css +++ b/mybatis-spring-boot-test-autoconfigure/src/site/resources/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../images/en.png') left no-repeat;padding-left: 32px; ma li.es {background: url('../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/resources/es/css/site.css b/mybatis-spring-boot-test-autoconfigure/src/site/resources/es/css/site.css index 82e53f64..f4ce27b9 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/site/resources/es/css/site.css +++ b/mybatis-spring-boot-test-autoconfigure/src/site/resources/es/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../../images/en.png') left no-repeat;padding-left: 32px; li.es {background: url('../../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/resources/ja/css/site.css b/mybatis-spring-boot-test-autoconfigure/src/site/resources/ja/css/site.css index 82e53f64..f4ce27b9 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/site/resources/ja/css/site.css +++ b/mybatis-spring-boot-test-autoconfigure/src/site/resources/ja/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../../images/en.png') left no-repeat;padding-left: 32px; li.es {background: url('../../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/resources/ko/css/site.css b/mybatis-spring-boot-test-autoconfigure/src/site/resources/ko/css/site.css index 82e53f64..f4ce27b9 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/site/resources/ko/css/site.css +++ b/mybatis-spring-boot-test-autoconfigure/src/site/resources/ko/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../../images/en.png') left no-repeat;padding-left: 32px; li.es {background: url('../../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/resources/zh/css/site.css b/mybatis-spring-boot-test-autoconfigure/src/site/resources/zh/css/site.css index 82e53f64..f4ce27b9 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/site/resources/zh/css/site.css +++ b/mybatis-spring-boot-test-autoconfigure/src/site/resources/zh/css/site.css @@ -26,4 +26,4 @@ li.en {background: url('../../images/en.png') left no-repeat;padding-left: 32px; li.es {background: url('../../images/es.png') left no-repeat;padding-left: 32px; margin: 10px} li.ja {background: url('../../images/ja.png') left no-repeat;padding-left: 32px; margin: 10px} li.zh {background: url('../../images/zh.png') left no-repeat;padding-left: 32px; margin: 10px} -li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} \ No newline at end of file +li.ko {background: url('../../images/ko.png') left no-repeat;padding-left: 32px; margin: 10px} diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/site_zh.xml b/mybatis-spring-boot-test-autoconfigure/src/site/site_zh.xml index a89fc546..e4108119 100644 --- a/mybatis-spring-boot-test-autoconfigure/src/site/site_zh.xml +++ b/mybatis-spring-boot-test-autoconfigure/src/site/site_zh.xml @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/mybatis-spring-boot-test-autoconfigure/src/test/resources/org/mybatis/spring/boot/test/autoconfigure/SampleMapper.xml b/mybatis-spring-boot-test-autoconfigure/src/test/resources/org/mybatis/spring/boot/test/autoconfigure/SampleMapper.xml index b27ec0a6..809ea3d4 100755 --- a/mybatis-spring-boot-test-autoconfigure/src/test/resources/org/mybatis/spring/boot/test/autoconfigure/SampleMapper.xml +++ b/mybatis-spring-boot-test-autoconfigure/src/test/resources/org/mybatis/spring/boot/test/autoconfigure/SampleMapper.xml @@ -31,4 +31,4 @@ insert into sample values(#{id}, #{name}) - \ No newline at end of file + From f0876b266779517f6d206a0851321c2bbce07b39 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 26 Aug 2023 21:19:42 -0400 Subject: [PATCH 6/7] [ci] update copyright dates --- .../src/main/resources/META-INF/spring.factories | 2 +- .../src/site/resources/css/site.css | 2 +- .../src/site/resources/es/css/site.css | 2 +- .../src/site/resources/ja/css/site.css | 2 +- .../src/site/resources/ko/css/site.css | 2 +- .../src/site/resources/zh/css/site.css | 2 +- .../src/test/resources/db/changelog/db.changelog-override.sql | 2 +- .../src/test/resources/logback-test.xml | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt | 2 +- .../src/main/kotlin/sample/mybatis/kotlin/domain/City.kt | 2 +- .../src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt | 2 +- .../sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt | 2 +- .../sample/mybatis/kotlin/SampleMybatisApplicationTest.kt | 2 +- .../sample/mybatis/kotlin/mapper/MapperTestApplication.kt | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/mappers/CityMapper-findByCountry.sql | 2 +- .../src/main/resources/mappers/CityMapper-findByState.sql | 2 +- .../src/main/resources/mappers/CityMapper-findByState.vm | 2 +- .../src/main/resources/mappers/CityMapper-findByState.vm | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../src/main/java/sample/mybatis/xml/domain/Hotel.java | 2 +- .../src/main/resources/application.properties | 2 +- .../src/site/resources/css/site.css | 2 +- .../src/site/resources/es/css/site.css | 2 +- .../src/site/resources/ja/css/site.css | 2 +- .../src/site/resources/ko/css/site.css | 2 +- .../src/site/resources/zh/css/site.css | 2 +- mybatis-spring-boot-test-autoconfigure/src/site/site_zh.xml | 2 +- .../org/mybatis/spring/boot/test/autoconfigure/SampleMapper.xml | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/mybatis-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/mybatis-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index 38ed9cd7..03d145ae 100644 --- a/mybatis-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/mybatis-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ # -# Copyright 2015-2022 the original author or authors. +# Copyright 2015-2023 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/mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css index b711d26e..14a9eebc 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/css/site.css @@ -1,5 +1,5 @@ /** - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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/mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css index f4ce27b9..804cd2bb 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/es/css/site.css @@ -1,5 +1,5 @@ /** - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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/mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css index f4ce27b9..804cd2bb 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/ja/css/site.css @@ -1,5 +1,5 @@ /** - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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/mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css index f4ce27b9..804cd2bb 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/ko/css/site.css @@ -1,5 +1,5 @@ /** - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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/mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css b/mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css index f4ce27b9..804cd2bb 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css +++ b/mybatis-spring-boot-autoconfigure/src/site/resources/zh/css/site.css @@ -1,5 +1,5 @@ /** - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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/mybatis-spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql b/mybatis-spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql index cd105ca3..e508eb73 100644 --- a/mybatis-spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql +++ b/mybatis-spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql @@ -1,5 +1,5 @@ -- --- Copyright 2015-2022 the original author or authors. +-- Copyright 2015-2023 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/mybatis-spring-boot-autoconfigure/src/test/resources/logback-test.xml b/mybatis-spring-boot-autoconfigure/src/test/resources/logback-test.xml index 14af4d2e..048eddc6 100644 --- a/mybatis-spring-boot-autoconfigure/src/test/resources/logback-test.xml +++ b/mybatis-spring-boot-autoconfigure/src/test/resources/logback-test.xml @@ -1,7 +1,7 @@