diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index ead2f0c..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: 2 -updates: -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: daily -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - labels: - - dependencies diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 5264b9d..6eb0e1c 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: zulu - name: Cache local Maven repository uses: actions/cache@v3 diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 9547eb4..61a21b0 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -12,7 +12,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: zulu - name: Cache local Maven repository uses: actions/cache@v3 diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index d4e5e82..c8af479 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, @@ -17,9 +17,9 @@ --> - - fr.jcgay.maven - maven-profiler - 3.2 - - \ No newline at end of file + + fr.jcgay.maven + maven-profiler + 3.2 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..956533e --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5 diff --git a/.mvn/settings.xml b/.mvn/settings.xml index f9df6e0..4b0023f 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, @@ -16,8 +16,8 @@ limitations under the License. --> - + ossrh @@ -33,4 +33,4 @@ ${env.GITHUB_TOKEN} - \ No newline at end of file + diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..732313c --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,162 @@ +/* + * 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 + * + * http://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.LinkOption; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.nio.file.StandardOpenOption; +import java.util.Properties; + +public final class MavenWrapperDownloader +{ + private static final String WRAPPER_VERSION = "3.1.1"; + + private static final boolean VERBOSE = Boolean.parseBoolean( System.getenv( "MVNW_VERBOSE" ) ); + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = + "https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/" + WRAPPER_VERSION + + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to use instead of the + * default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main( String[] args ) + { + if ( args.length == 0 ) + { + System.err.println( " - ERROR projectBasedir parameter missing" ); + System.exit( 1 ); + } + + log( " - Downloader started" ); + final String dir = args[0].replace( "..", "" ); // Sanitize path + final Path projectBasedir = Paths.get( dir ).toAbsolutePath().normalize(); + if ( !Files.isDirectory( projectBasedir, LinkOption.NOFOLLOW_LINKS ) ) + { + System.err.println( " - ERROR projectBasedir not exists: " + projectBasedir ); + System.exit( 1 ); + } + + log( " - Using base directory: " + projectBasedir ); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + Path mavenWrapperPropertyFile = projectBasedir.resolve( MAVEN_WRAPPER_PROPERTIES_PATH ); + String url = readWrapperUrl( mavenWrapperPropertyFile ); + + try + { + Path outputFile = projectBasedir.resolve( MAVEN_WRAPPER_JAR_PATH ); + createDirectories( outputFile.getParent() ); + downloadFileFromURL( url, outputFile ); + log( "Done" ); + System.exit( 0 ); + } + catch ( IOException e ) + { + System.err.println( "- Error downloading" ); + e.printStackTrace(); + System.exit( 1 ); + } + } + + private static void downloadFileFromURL( String urlString, Path destination ) throws IOException + { + log( " - Downloading to: " + destination ); + 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 ); + } + } ); + } + URL website = new URL( urlString ); + try ( InputStream inStream = website.openStream() ) { + Files.copy( inStream, destination, StandardCopyOption.REPLACE_EXISTING ); + } + log( " - Downloader complete" ); + } + + private static void createDirectories(Path outputPath) throws IOException + { + if ( !Files.isDirectory( outputPath, LinkOption.NOFOLLOW_LINKS ) ) { + Path createDirectories = Files.createDirectories( outputPath ); + log( " - Directories created: " + createDirectories ); + } + } + + private static String readWrapperUrl( Path mavenWrapperPropertyFile ) + { + String url = DEFAULT_DOWNLOAD_URL; + if ( Files.exists( mavenWrapperPropertyFile, LinkOption.NOFOLLOW_LINKS ) ) + { + log( " - Reading property file: " + mavenWrapperPropertyFile ); + try ( InputStream in = Files.newInputStream( mavenWrapperPropertyFile, StandardOpenOption.READ ) ) + { + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load( in ); + url = mavenWrapperProperties.getProperty( PROPERTY_NAME_WRAPPER_URL, DEFAULT_DOWNLOAD_URL ); + } + catch ( IOException e ) + { + System.err.println( " - ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'" ); + } + } + log( " - Downloading from: " + url ); + return url; + } + + 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 8c79a83..dc3affc 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -5,14 +5,14 @@ # 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 -# -# 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 # "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. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/samples/configuration/license.txt b/LICENSE_HEADER similarity index 86% rename from samples/configuration/license.txt rename to LICENSE_HEADER index 5d63374..a81590a 100644 --- a/samples/configuration/license.txt +++ b/LICENSE_HEADER @@ -4,10 +4,10 @@ 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 "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. \ No newline at end of file + limitations under the License. diff --git a/README.md b/README.md index b209d20..ae1102a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Maven central](https://maven-badges.herokuapp.com/maven-central/org.mybatis.spring.native/mybatis-spring-native/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.mybatis.spring.native/mybatis-spring-native) [![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/org.mybatis.spring.native/mybatis-spring-native.svg)](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/spring/native/mybatis-spring-native/) -[![License](http://img.shields.io/:license-apache-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) +[![License](https://img.shields.io/:license-apache-brightgreen.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) ![mybatis-spring](http://mybatis.github.io/images/mybatis-logo.png) diff --git a/core/license.txt b/core/LICENSE_HEADER similarity index 86% rename from core/license.txt rename to core/LICENSE_HEADER index 5d63374..a81590a 100644 --- a/core/license.txt +++ b/core/LICENSE_HEADER @@ -4,10 +4,10 @@ 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 "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. \ No newline at end of file + limitations under the License. diff --git a/core/format.xml b/core/format.xml index 537c350..6c1a025 100644 --- a/core/format.xml +++ b/core/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/core/pom.xml b/core/pom.xml index 0399556..a2bb726 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/core/src/main/java/org/mybatis/spring/nativex/MyBatisCoreNativeConfiguration.java b/core/src/main/java/org/mybatis/spring/nativex/MyBatisCoreNativeConfiguration.java index e72127d..7af0522 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisCoreNativeConfiguration.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisCoreNativeConfiguration.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, @@ -53,6 +53,7 @@ * * @author Kazuki Shimizu * @author Josh Long + * * @see MyBatisMapperNativeConfigurationProcessor */ // @formatter:off diff --git a/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperFactoryBeanPostProcessor.java b/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperFactoryBeanPostProcessor.java index 2ef8ae9..44aa809 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperFactoryBeanPostProcessor.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperFactoryBeanPostProcessor.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperNativeConfigurationProcessor.java b/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperNativeConfigurationProcessor.java index b7b8fd0..f799f8a 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperNativeConfigurationProcessor.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperNativeConfigurationProcessor.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperTypeUtils.java b/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperTypeUtils.java index c914466..180ab41 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperTypeUtils.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisMapperTypeUtils.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/main/java/org/mybatis/spring/nativex/MyBatisResourcesScan.java b/core/src/main/java/org/mybatis/spring/nativex/MyBatisResourcesScan.java index 23a8476..7806f35 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisResourcesScan.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisResourcesScan.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesHolder.java b/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesHolder.java index 5e16aa2..3a1fead 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesHolder.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesHolder.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesNativeConfigurationProcessor.java b/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesNativeConfigurationProcessor.java index db52b59..23c7bd2 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesNativeConfigurationProcessor.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesNativeConfigurationProcessor.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/main/java/org/mybatis/spring/nativex/MyBatisSpringNativeConfiguration.java b/core/src/main/java/org/mybatis/spring/nativex/MyBatisSpringNativeConfiguration.java index 7de067f..297b6b0 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisSpringNativeConfiguration.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisSpringNativeConfiguration.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/main/java/org/mybatis/spring/nativex/autoconfigure/MyBatisSpringNativeAutoConfiguration.java b/core/src/main/java/org/mybatis/spring/nativex/autoconfigure/MyBatisSpringNativeAutoConfiguration.java index 8907959..afac990 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/autoconfigure/MyBatisSpringNativeAutoConfiguration.java +++ b/core/src/main/java/org/mybatis/spring/nativex/autoconfigure/MyBatisSpringNativeAutoConfiguration.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/main/resources/META-INF/spring.factories b/core/src/main/resources/META-INF/spring.factories index 1286e91..911d0e7 100644 --- a/core/src/main/resources/META-INF/spring.factories +++ b/core/src/main/resources/META-INF/spring.factories @@ -1,3 +1,19 @@ +# +# Copyright 2022 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. +# 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. +# + org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.BeanFactoryNativeConfigurationProcessor=\ org.mybatis.spring.nativex.MyBatisMapperNativeConfigurationProcessor,\ org.mybatis.spring.nativex.MyBatisScannedResourcesNativeConfigurationProcessor diff --git a/core/src/site/site.xml b/core/src/site/site.xml index 600656b..b70b171 100644 --- a/core/src/site/site.xml +++ b/core/src/site/site.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperFactoryBeanPostProcessorTest.java b/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperFactoryBeanPostProcessorTest.java index bbbf1a6..8ef4c55 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperFactoryBeanPostProcessorTest.java +++ b/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperFactoryBeanPostProcessorTest.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperNativeConfigurationProcessorTest.java b/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperNativeConfigurationProcessorTest.java index a201e49..414ea54 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperNativeConfigurationProcessorTest.java +++ b/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperNativeConfigurationProcessorTest.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperTypeUtilsTest.java b/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperTypeUtilsTest.java index a94a4e1..ec83b71 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperTypeUtilsTest.java +++ b/core/src/test/java/org/mybatis/spring/nativex/MyBatisMapperTypeUtilsTest.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/MyBatisResourcesScanTest.java b/core/src/test/java/org/mybatis/spring/nativex/MyBatisResourcesScanTest.java index 75eeb00..bf7b21c 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/MyBatisResourcesScanTest.java +++ b/core/src/test/java/org/mybatis/spring/nativex/MyBatisResourcesScanTest.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/MyBatisScannedResourcesNativeConfigurationProcessorTest.java b/core/src/test/java/org/mybatis/spring/nativex/MyBatisScannedResourcesNativeConfigurationProcessorTest.java index 59f94d1..4182842 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/MyBatisScannedResourcesNativeConfigurationProcessorTest.java +++ b/core/src/test/java/org/mybatis/spring/nativex/MyBatisScannedResourcesNativeConfigurationProcessorTest.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/autoconfigure/MyBatisSpringNativeAutoConfigurationTest.java b/core/src/test/java/org/mybatis/spring/nativex/autoconfigure/MyBatisSpringNativeAutoConfigurationTest.java index 49c18ab..99a6a39 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/autoconfigure/MyBatisSpringNativeAutoConfigurationTest.java +++ b/core/src/test/java/org/mybatis/spring/nativex/autoconfigure/MyBatisSpringNativeAutoConfigurationTest.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/component/AbstractTypeHandler.java b/core/src/test/java/org/mybatis/spring/nativex/component/AbstractTypeHandler.java index 8b51bc6..e59202e 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/component/AbstractTypeHandler.java +++ b/core/src/test/java/org/mybatis/spring/nativex/component/AbstractTypeHandler.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/component/BarService.java b/core/src/test/java/org/mybatis/spring/nativex/component/BarService.java index 7b4fedf..3123813 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/component/BarService.java +++ b/core/src/test/java/org/mybatis/spring/nativex/component/BarService.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/component/BarTypeHandler.java b/core/src/test/java/org/mybatis/spring/nativex/component/BarTypeHandler.java index 4f96adf..cb9af91 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/component/BarTypeHandler.java +++ b/core/src/test/java/org/mybatis/spring/nativex/component/BarTypeHandler.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/component/FooTypeHandler.java b/core/src/test/java/org/mybatis/spring/nativex/component/FooTypeHandler.java index 5929495..e6af61c 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/component/FooTypeHandler.java +++ b/core/src/test/java/org/mybatis/spring/nativex/component/FooTypeHandler.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/component/MyAnnotation.java b/core/src/test/java/org/mybatis/spring/nativex/component/MyAnnotation.java index 0588654..593447a 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/component/MyAnnotation.java +++ b/core/src/test/java/org/mybatis/spring/nativex/component/MyAnnotation.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/component/MyTypeHandlerInterface.java b/core/src/test/java/org/mybatis/spring/nativex/component/MyTypeHandlerInterface.java index faa7191..4a8316e 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/component/MyTypeHandlerInterface.java +++ b/core/src/test/java/org/mybatis/spring/nativex/component/MyTypeHandlerInterface.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/component/TypeHandlers.java b/core/src/test/java/org/mybatis/spring/nativex/component/TypeHandlers.java index da0bef4..d23d5a1 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/component/TypeHandlers.java +++ b/core/src/test/java/org/mybatis/spring/nativex/component/TypeHandlers.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/component2/AnyTypeHandler.java b/core/src/test/java/org/mybatis/spring/nativex/component2/AnyTypeHandler.java index c39b9f8..80ea728 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/component2/AnyTypeHandler.java +++ b/core/src/test/java/org/mybatis/spring/nativex/component2/AnyTypeHandler.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/entity/City.java b/core/src/test/java/org/mybatis/spring/nativex/entity/City.java index 0bbe78a..af8e8b4 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/entity/City.java +++ b/core/src/test/java/org/mybatis/spring/nativex/entity/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/entity/Country.java b/core/src/test/java/org/mybatis/spring/nativex/entity/Country.java index 537e83e..75a0036 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/entity/Country.java +++ b/core/src/test/java/org/mybatis/spring/nativex/entity/Country.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/entity/EntityMarkerAnnotation.java b/core/src/test/java/org/mybatis/spring/nativex/entity/EntityMarkerAnnotation.java index c87cd56..a09e84d 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/entity/EntityMarkerAnnotation.java +++ b/core/src/test/java/org/mybatis/spring/nativex/entity/EntityMarkerAnnotation.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/entity/EntityMarkerInterface.java b/core/src/test/java/org/mybatis/spring/nativex/entity/EntityMarkerInterface.java index 209b29d..29fd7c5 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/entity/EntityMarkerInterface.java +++ b/core/src/test/java/org/mybatis/spring/nativex/entity/EntityMarkerInterface.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/mapper/Sample2Mapper.java b/core/src/test/java/org/mybatis/spring/nativex/mapper/Sample2Mapper.java index ff49cea..3f2e1ed 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/mapper/Sample2Mapper.java +++ b/core/src/test/java/org/mybatis/spring/nativex/mapper/Sample2Mapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/mapper/Sample3Mapper.java b/core/src/test/java/org/mybatis/spring/nativex/mapper/Sample3Mapper.java index 2b8f100..b5c3fb9 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/mapper/Sample3Mapper.java +++ b/core/src/test/java/org/mybatis/spring/nativex/mapper/Sample3Mapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/mapper/SampleMapper.java b/core/src/test/java/org/mybatis/spring/nativex/mapper/SampleMapper.java index b607493..db57106 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/mapper/SampleMapper.java +++ b/core/src/test/java/org/mybatis/spring/nativex/mapper/SampleMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/java/org/mybatis/spring/nativex/marker/StandardEntity.java b/core/src/test/java/org/mybatis/spring/nativex/marker/StandardEntity.java index 1dc2e9e..320e990 100644 --- a/core/src/test/java/org/mybatis/spring/nativex/marker/StandardEntity.java +++ b/core/src/test/java/org/mybatis/spring/nativex/marker/StandardEntity.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/core/src/test/resources/mapper/sub1/BarMapper.xml b/core/src/test/resources/mapper/sub1/BarMapper.xml index 596b32b..27081de 100644 --- a/core/src/test/resources/mapper/sub1/BarMapper.xml +++ b/core/src/test/resources/mapper/sub1/BarMapper.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/core/src/test/resources/mapper/sub1/FooMapper.xml b/core/src/test/resources/mapper/sub1/FooMapper.xml index 0c74c06..1a8d4df 100644 --- a/core/src/test/resources/mapper/sub1/FooMapper.xml +++ b/core/src/test/resources/mapper/sub1/FooMapper.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/core/src/test/resources/mapper/sub2/AnyMapper.xml b/core/src/test/resources/mapper/sub2/AnyMapper.xml index b03e14a..c989023 100644 --- a/core/src/test/resources/mapper/sub2/AnyMapper.xml +++ b/core/src/test/resources/mapper/sub2/AnyMapper.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/license.txt b/docs/LICENSE_HEADER similarity index 86% rename from license.txt rename to docs/LICENSE_HEADER index 5d63374..a81590a 100644 --- a/license.txt +++ b/docs/LICENSE_HEADER @@ -4,10 +4,10 @@ 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 "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. \ No newline at end of file + limitations under the License. diff --git a/docs/pom.xml b/docs/pom.xml index 9642c07..13e1a97 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/docs/src/site/resources/css/site.css b/docs/src/site/resources/css/site.css index eef5cae..ca7949a 100644 --- a/docs/src/site/resources/css/site.css +++ b/docs/src/site/resources/css/site.css @@ -1,17 +1,17 @@ /** - * Copyright 2022 the original author or authors. + * Copyright 2022 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. - * You may obtain a copy of the License at + * Licensed 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 * - * 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 "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. + * 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. */ /* * when new flags are needed, take them from diff --git a/docs/src/site/resources/es/css/site.css b/docs/src/site/resources/es/css/site.css index 396a712..01c2b58 100644 --- a/docs/src/site/resources/es/css/site.css +++ b/docs/src/site/resources/es/css/site.css @@ -1,17 +1,17 @@ /** - * Copyright 2022 the original author or authors. + * Copyright 2022 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. - * You may obtain a copy of the License at + * Licensed 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 * - * 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 "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. + * 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. */ /* * when new flags are needed, take them from diff --git a/docs/src/site/resources/ja/css/site.css b/docs/src/site/resources/ja/css/site.css index 396a712..01c2b58 100644 --- a/docs/src/site/resources/ja/css/site.css +++ b/docs/src/site/resources/ja/css/site.css @@ -1,17 +1,17 @@ /** - * Copyright 2022 the original author or authors. + * Copyright 2022 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. - * You may obtain a copy of the License at + * Licensed 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 * - * 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 "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. + * 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. */ /* * when new flags are needed, take them from diff --git a/docs/src/site/resources/ko/css/site.css b/docs/src/site/resources/ko/css/site.css index 396a712..01c2b58 100644 --- a/docs/src/site/resources/ko/css/site.css +++ b/docs/src/site/resources/ko/css/site.css @@ -1,17 +1,17 @@ /** - * Copyright 2022 the original author or authors. + * Copyright 2022 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. - * You may obtain a copy of the License at + * Licensed 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 * - * 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 "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. + * 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. */ /* * when new flags are needed, take them from diff --git a/docs/src/site/resources/zh/css/site.css b/docs/src/site/resources/zh/css/site.css index 396a712..01c2b58 100644 --- a/docs/src/site/resources/zh/css/site.css +++ b/docs/src/site/resources/zh/css/site.css @@ -1,17 +1,17 @@ /** - * Copyright 2022 the original author or authors. + * Copyright 2022 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. - * You may obtain a copy of the License at + * Licensed 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 * - * 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 "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. + * 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. */ /* * when new flags are needed, take them from diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml index d1a0504..63ed6e1 100644 --- a/docs/src/site/site.xml +++ b/docs/src/site/site.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/docs/src/site/site_ko.xml b/docs/src/site/site_ko.xml index 7bce061..0867d24 100644 --- a/docs/src/site/site_ko.xml +++ b/docs/src/site/site_ko.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/docs/src/site/site_zh.xml b/docs/src/site/site_zh.xml index 798b3cc..b35f7fa 100644 --- a/docs/src/site/site_zh.xml +++ b/docs/src/site/site_zh.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/cache/license.txt b/extensions/LICENSE_HEADER similarity index 86% rename from samples/cache/license.txt rename to extensions/LICENSE_HEADER index 5d63374..a81590a 100644 --- a/samples/cache/license.txt +++ b/extensions/LICENSE_HEADER @@ -4,10 +4,10 @@ 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 "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. \ No newline at end of file + limitations under the License. diff --git a/extensions/pom.xml b/extensions/pom.xml index 977afa0..5d3edac 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisDynamicSqlNativeConfiguration.java b/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisDynamicSqlNativeConfiguration.java index 32009c4..abe66ce 100644 --- a/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisDynamicSqlNativeConfiguration.java +++ b/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisDynamicSqlNativeConfiguration.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisFreeMarkerNativeConfiguration.java b/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisFreeMarkerNativeConfiguration.java index 46d88b2..20c04ed 100644 --- a/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisFreeMarkerNativeConfiguration.java +++ b/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisFreeMarkerNativeConfiguration.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisThymeleafNativeConfiguration.java b/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisThymeleafNativeConfiguration.java index 3661953..4b3e773 100644 --- a/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisThymeleafNativeConfiguration.java +++ b/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisThymeleafNativeConfiguration.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisVelocityNativeConfiguration.java b/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisVelocityNativeConfiguration.java index 62f4be0..f8dd89a 100644 --- a/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisVelocityNativeConfiguration.java +++ b/extensions/src/main/java/org/mybatis/spring/nativex/MyBatisVelocityNativeConfiguration.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/extensions/src/main/resources/META-INF/spring.factories b/extensions/src/main/resources/META-INF/spring.factories index 7e3b8c1..d2a044d 100644 --- a/extensions/src/main/resources/META-INF/spring.factories +++ b/extensions/src/main/resources/META-INF/spring.factories @@ -1,3 +1,19 @@ +# +# Copyright 2022 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. +# 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. +# + org.springframework.nativex.type.NativeConfiguration=\ org.mybatis.spring.nativex.MyBatisThymeleafNativeConfiguration,\ org.mybatis.spring.nativex.MyBatisVelocityNativeConfiguration,\ diff --git a/extensions/src/site/site.xml b/extensions/src/site/site.xml index 600656b..b70b171 100644 --- a/extensions/src/site/site.xml +++ b/extensions/src/site/site.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/format.xml b/format.xml index 537c350..6c1a025 100644 --- a/format.xml +++ b/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/mvnw b/mvnw index 5643201..b7f0646 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Maven Start Up Batch script +# Apache Maven Wrapper startup batch script, version 3.1.1 # # Required ENV vars: # ------------------ @@ -27,7 +27,6 @@ # # Optional ENV vars # ----------------- -# M2_HOME - location of maven2's installed home dir # MAVEN_OPTS - parameters passed to the Java VM when running Maven # e.g. to debug Maven itself, use # set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 @@ -62,9 +61,9 @@ case "`uname`" in # See https://developer.apple.com/library/mac/qa/qa1170/_index.html if [ -z "$JAVA_HOME" ]; then if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" + JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME else - export JAVA_HOME="/Library/Java/Home" + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME fi fi ;; @@ -76,36 +75,8 @@ if [ -z "$JAVA_HOME" ] ; then fi fi -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` [ -n "$CLASSPATH" ] && @@ -114,8 +85,6 @@ fi # For Mingw, ensure paths are in UNIX format before anything is touched if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" [ -n "$JAVA_HOME" ] && JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" fi @@ -163,12 +132,9 @@ if [ -z "$JAVA_HOME" ] ; then echo "Warning: JAVA_HOME environment variable is not set." fi -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - # traverses directory structure from process work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { - if [ -z "$1" ] then echo "Path not specified to find_maven_basedir" @@ -188,7 +154,7 @@ find_maven_basedir() { fi # end of workaround done - echo "${basedir}" + printf '%s' "$(cd "$basedir"; pwd)" } # concatenates all lines of a file @@ -198,11 +164,16 @@ concat_lines() { fi } -BASE_DIR=`find_maven_basedir "$(pwd)"` +BASE_DIR=$(find_maven_basedir "$(dirname $0)") if [ -z "$BASE_DIR" ]; then exit 1; fi +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi + ########################################################################################## # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central # This allows using the maven wrapper in projects that prohibit checking in binary data. @@ -216,16 +187,16 @@ else echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." fi if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" fi while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;; esac done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" + echo "Downloading from: $wrapperUrl" fi wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" if $cygwin; then @@ -233,42 +204,49 @@ else fi if command -v wget > /dev/null; then + QUIET="--quiet" if [ "$MVNW_VERBOSE" = true ]; then echo "Found wget ... using wget" + QUIET="" fi if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" elif command -v curl > /dev/null; then + QUIET="--silent" if [ "$MVNW_VERBOSE" = true ]; then echo "Found curl ... using curl" + QUIET="" fi if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L fi - + [ $? -eq 0 ] || rm -f "$wrapperJarPath" else if [ "$MVNW_VERBOSE" = true ]; then echo "Falling back to using Java to download" fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" # For Cygwin, switch paths to Windows format before running javac if $cygwin; then + javaSource=`cygpath --path --windows "$javaSource"` javaClass=`cygpath --path --windows "$javaClass"` fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then if [ "$MVNW_VERBOSE" = true ]; then echo " - Compiling MavenWrapperDownloader.java ..." fi # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") + ("$JAVA_HOME/bin/javac" "$javaSource") fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ -e "$javaClass" ]; then # Running the downloader if [ "$MVNW_VERBOSE" = true ]; then echo " - Running MavenWrapperDownloader.java ..." @@ -282,16 +260,10 @@ fi # End of extension ########################################################################################## -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" # For Cygwin, switch paths to Windows format before running java if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` [ -n "$CLASSPATH" ] && @@ -311,6 +283,5 @@ exec "$JAVACMD" \ $MAVEN_OPTS \ $MAVEN_DEBUG_OPTS \ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 8a15b7f..474c9d6 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -18,13 +18,12 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script +@REM Apache Maven Wrapper startup batch script, version 3.1.1 @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @REM @REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands @REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven @@ -120,10 +119,10 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B ) @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central @@ -134,11 +133,11 @@ if exist %WRAPPER_JAR% ( ) ) else ( if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" ) if "%MVNW_VERBOSE%" == "true" ( echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% + echo Downloading from: %WRAPPER_URL% ) powershell -Command "&{"^ @@ -146,7 +145,7 @@ if exist %WRAPPER_JAR% ( "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ "}" if "%MVNW_VERBOSE%" == "true" ( echo Finished downloading %WRAPPER_JAR% diff --git a/pom.xml b/pom.xml index 8585caa..e6e2ddc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/LICENSE_HEADER b/samples/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/cache/LICENSE_HEADER b/samples/cache/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/cache/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/cache/format.xml b/samples/cache/format.xml index 659bfa5..3c5c604 100644 --- a/samples/cache/format.xml +++ b/samples/cache/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/cache/pom.xml b/samples/cache/pom.xml index 77ab769..fb15fd2 100644 --- a/samples/cache/pom.xml +++ b/samples/cache/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/City.java b/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/City.java index 85cae48..21c04dc 100644 --- a/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/City.java +++ b/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/CityMapper.java b/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/CityMapper.java index ed398a8..e81284d 100644 --- a/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/CityMapper.java +++ b/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/MybatisSpringNativeSampleApplication.java b/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/MybatisSpringNativeSampleApplication.java index b9853d4..b1ac045 100644 --- a/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/MybatisSpringNativeSampleApplication.java +++ b/samples/cache/src/main/java/org/mybatis/spring/nativex/sample/cache/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/cache/src/main/resources/application.properties b/samples/cache/src/main/resources/application.properties index 9316730..649f145 100644 --- a/samples/cache/src/main/resources/application.properties +++ b/samples/cache/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/cache/src/main/resources/data.sql b/samples/cache/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/cache/src/main/resources/data.sql +++ b/samples/cache/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/cache/src/main/resources/schema.sql b/samples/cache/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/cache/src/main/resources/schema.sql +++ b/samples/cache/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/configuration/LICENSE_HEADER b/samples/configuration/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/configuration/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/configuration/format.xml b/samples/configuration/format.xml index 659bfa5..3c5c604 100644 --- a/samples/configuration/format.xml +++ b/samples/configuration/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/configuration/pom.xml b/samples/configuration/pom.xml index fd43b74..6086857 100644 --- a/samples/configuration/pom.xml +++ b/samples/configuration/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/City.java b/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/City.java index 4a581e3..d492617 100644 --- a/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/City.java +++ b/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/CityMapper.java b/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/CityMapper.java index ed2fe27..d052c60 100644 --- a/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/CityMapper.java +++ b/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/MybatisSpringNativeSampleApplication.java b/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/MybatisSpringNativeSampleApplication.java index fd0e955..729ca02 100644 --- a/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/MybatisSpringNativeSampleApplication.java +++ b/samples/configuration/src/main/java/org/mybatis/spring/nativex/sample/configuration/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/configuration/src/main/resources/application.properties b/samples/configuration/src/main/resources/application.properties index d9f381a..fc3ba31 100644 --- a/samples/configuration/src/main/resources/application.properties +++ b/samples/configuration/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/configuration/src/main/resources/data.sql b/samples/configuration/src/main/resources/data.sql index d9e05f5..2d98526 100644 --- a/samples/configuration/src/main/resources/data.sql +++ b/samples/configuration/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/configuration/src/main/resources/schema.sql b/samples/configuration/src/main/resources/schema.sql index ae0a0db..0ebe757 100644 --- a/samples/configuration/src/main/resources/schema.sql +++ b/samples/configuration/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/dao/LICENSE_HEADER b/samples/dao/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/dao/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/dao/format.xml b/samples/dao/format.xml index 659bfa5..3c5c604 100644 --- a/samples/dao/format.xml +++ b/samples/dao/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/dao/license.txt b/samples/dao/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/dao/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/dao/pom.xml b/samples/dao/pom.xml index a638f1c..0a7f857 100644 --- a/samples/dao/pom.xml +++ b/samples/dao/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/City.java b/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/City.java index 759edcf..dec8c34 100644 --- a/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/City.java +++ b/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/CityDao.java b/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/CityDao.java index 5dbe09b..ed0605d 100644 --- a/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/CityDao.java +++ b/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/CityDao.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/MybatisSpringNativeSampleApplication.java b/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/MybatisSpringNativeSampleApplication.java index 52d9903..4c2dbd0 100644 --- a/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/MybatisSpringNativeSampleApplication.java +++ b/samples/dao/src/main/java/org/mybatis/spring/nativex/sample/dao/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/dao/src/main/resources/application.properties b/samples/dao/src/main/resources/application.properties index c0bec78..8a45f78 100644 --- a/samples/dao/src/main/resources/application.properties +++ b/samples/dao/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/dao/src/main/resources/dao/CityDao.xml b/samples/dao/src/main/resources/dao/CityDao.xml index 0052e7e..5eda106 100644 --- a/samples/dao/src/main/resources/dao/CityDao.xml +++ b/samples/dao/src/main/resources/dao/CityDao.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/dao/src/main/resources/data.sql b/samples/dao/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/dao/src/main/resources/data.sql +++ b/samples/dao/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/dao/src/main/resources/schema.sql b/samples/dao/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/dao/src/main/resources/schema.sql +++ b/samples/dao/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/dynamic-sql/LICENSE_HEADER b/samples/dynamic-sql/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/dynamic-sql/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/dynamic-sql/format.xml b/samples/dynamic-sql/format.xml index 659bfa5..3c5c604 100644 --- a/samples/dynamic-sql/format.xml +++ b/samples/dynamic-sql/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/dynamic-sql/license.txt b/samples/dynamic-sql/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/dynamic-sql/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/dynamic-sql/pom.xml b/samples/dynamic-sql/pom.xml index dd9abf2..ac52a7b 100644 --- a/samples/dynamic-sql/pom.xml +++ b/samples/dynamic-sql/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/City.java b/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/City.java index a9ac52a..5706ff8 100644 --- a/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/City.java +++ b/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/CityMapper.java b/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/CityMapper.java index 6cc5666..626c38a 100644 --- a/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/CityMapper.java +++ b/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/MybatisSpringNativeSampleApplication.java b/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/MybatisSpringNativeSampleApplication.java index 151309e..ec4842f 100644 --- a/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/MybatisSpringNativeSampleApplication.java +++ b/samples/dynamic-sql/src/main/java/org/mybatis/spring/nativex/sample/dynamicsql/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/dynamic-sql/src/main/resources/application.properties b/samples/dynamic-sql/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/dynamic-sql/src/main/resources/application.properties +++ b/samples/dynamic-sql/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/dynamic-sql/src/main/resources/data.sql b/samples/dynamic-sql/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/dynamic-sql/src/main/resources/data.sql +++ b/samples/dynamic-sql/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/dynamic-sql/src/main/resources/schema.sql b/samples/dynamic-sql/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/dynamic-sql/src/main/resources/schema.sql +++ b/samples/dynamic-sql/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/format.xml b/samples/format.xml index 537c350..6c1a025 100644 --- a/samples/format.xml +++ b/samples/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/freemarker/LICENSE_HEADER b/samples/freemarker/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/freemarker/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/freemarker/format.xml b/samples/freemarker/format.xml index 659bfa5..3c5c604 100644 --- a/samples/freemarker/format.xml +++ b/samples/freemarker/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/freemarker/license.txt b/samples/freemarker/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/freemarker/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/freemarker/pom.xml b/samples/freemarker/pom.xml index 64b6549..1829a97 100644 --- a/samples/freemarker/pom.xml +++ b/samples/freemarker/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/City.java b/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/City.java index 6cdf162..677e820 100644 --- a/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/City.java +++ b/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/CityMapper.java b/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/CityMapper.java index 714350e..3ba1fe9 100644 --- a/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/CityMapper.java +++ b/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/MybatisSpringNativeSampleApplication.java b/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/MybatisSpringNativeSampleApplication.java index 1424277..ffcd685 100644 --- a/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/MybatisSpringNativeSampleApplication.java +++ b/samples/freemarker/src/main/java/org/mybatis/spring/nativex/sample/freemarker/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/freemarker/src/main/resources/application.properties b/samples/freemarker/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/freemarker/src/main/resources/application.properties +++ b/samples/freemarker/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/freemarker/src/main/resources/data.sql b/samples/freemarker/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/freemarker/src/main/resources/data.sql +++ b/samples/freemarker/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/freemarker/src/main/resources/org/mybatis/spring/nativex/sample/freemarker/CityMapper/CityMapper-findAll.ftl b/samples/freemarker/src/main/resources/org/mybatis/spring/nativex/sample/freemarker/CityMapper/CityMapper-findAll.ftl index d7b21b6..d6c1d91 100644 --- a/samples/freemarker/src/main/resources/org/mybatis/spring/nativex/sample/freemarker/CityMapper/CityMapper-findAll.ftl +++ b/samples/freemarker/src/main/resources/org/mybatis/spring/nativex/sample/freemarker/CityMapper/CityMapper-findAll.ftl @@ -6,7 +6,7 @@ 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 "AS IS" BASIS, diff --git a/samples/freemarker/src/main/resources/org/mybatis/spring/nativex/sample/freemarker/CityMapper/CityMapper-insert.ftl b/samples/freemarker/src/main/resources/org/mybatis/spring/nativex/sample/freemarker/CityMapper/CityMapper-insert.ftl index c55bd02..73ad73b 100644 --- a/samples/freemarker/src/main/resources/org/mybatis/spring/nativex/sample/freemarker/CityMapper/CityMapper-insert.ftl +++ b/samples/freemarker/src/main/resources/org/mybatis/spring/nativex/sample/freemarker/CityMapper/CityMapper-insert.ftl @@ -6,7 +6,7 @@ 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 "AS IS" BASIS, diff --git a/samples/freemarker/src/main/resources/schema.sql b/samples/freemarker/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/freemarker/src/main/resources/schema.sql +++ b/samples/freemarker/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/license.txt b/samples/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/pom.xml b/samples/pom.xml index c2b9d11..a12938c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/scan/LICENSE_HEADER b/samples/scan/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/scan/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/scan/format.xml b/samples/scan/format.xml index 659bfa5..3c5c604 100644 --- a/samples/scan/format.xml +++ b/samples/scan/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/scan/license.txt b/samples/scan/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/scan/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/scan/pom.xml b/samples/scan/pom.xml index 569af41..66a92fe 100644 --- a/samples/scan/pom.xml +++ b/samples/scan/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/external/entity/City.java b/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/external/entity/City.java index c5cae81..cc2ba55 100644 --- a/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/external/entity/City.java +++ b/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/external/entity/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/external/mapper/CityMapper.java b/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/external/mapper/CityMapper.java index ecfc38f..8ef9eab 100644 --- a/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/external/mapper/CityMapper.java +++ b/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/external/mapper/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/scan/MybatisSpringNativeSampleApplication.java b/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/scan/MybatisSpringNativeSampleApplication.java index e8f7c1a..ff311e0 100644 --- a/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/scan/MybatisSpringNativeSampleApplication.java +++ b/samples/scan/src/main/java/org/mybatis/spring/nativex/sample/scan/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/scan/src/main/resources/application.properties b/samples/scan/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/scan/src/main/resources/application.properties +++ b/samples/scan/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/scan/src/main/resources/data.sql b/samples/scan/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/scan/src/main/resources/data.sql +++ b/samples/scan/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/scan/src/main/resources/mapper/CityMapper.xml b/samples/scan/src/main/resources/mapper/CityMapper.xml index 5c52e80..02476f4 100644 --- a/samples/scan/src/main/resources/mapper/CityMapper.xml +++ b/samples/scan/src/main/resources/mapper/CityMapper.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/scan/src/main/resources/schema.sql b/samples/scan/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/scan/src/main/resources/schema.sql +++ b/samples/scan/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/simple/LICENSE_HEADER b/samples/simple/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/simple/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/simple/format.xml b/samples/simple/format.xml index 659bfa5..3c5c604 100644 --- a/samples/simple/format.xml +++ b/samples/simple/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/simple/license.txt b/samples/simple/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/simple/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/simple/pom.xml b/samples/simple/pom.xml index fce3500..56121e3 100644 --- a/samples/simple/pom.xml +++ b/samples/simple/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/City.java b/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/City.java index 245531a..fb88bc3 100644 --- a/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/City.java +++ b/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/CityMapper.java b/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/CityMapper.java index 5d209b9..23a4e6a 100644 --- a/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/CityMapper.java +++ b/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/MybatisSpringNativeSampleApplication.java b/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/MybatisSpringNativeSampleApplication.java index 91b90d2..c434c6b 100644 --- a/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/MybatisSpringNativeSampleApplication.java +++ b/samples/simple/src/main/java/org/mybatis/spring/nativex/sample/simple/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/simple/src/main/resources/application.properties b/samples/simple/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/simple/src/main/resources/application.properties +++ b/samples/simple/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/simple/src/main/resources/data.sql b/samples/simple/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/simple/src/main/resources/data.sql +++ b/samples/simple/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/simple/src/main/resources/schema.sql b/samples/simple/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/simple/src/main/resources/schema.sql +++ b/samples/simple/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/sqlprovider/LICENSE_HEADER b/samples/sqlprovider/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/sqlprovider/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/sqlprovider/format.xml b/samples/sqlprovider/format.xml index 659bfa5..3c5c604 100644 --- a/samples/sqlprovider/format.xml +++ b/samples/sqlprovider/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/sqlprovider/license.txt b/samples/sqlprovider/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/sqlprovider/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/sqlprovider/pom.xml b/samples/sqlprovider/pom.xml index 547a51d..c0952f0 100644 --- a/samples/sqlprovider/pom.xml +++ b/samples/sqlprovider/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/City.java b/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/City.java index 0d224d3..d921831 100644 --- a/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/City.java +++ b/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/CityMapper.java b/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/CityMapper.java index 1ac4e50..b8a2e38 100644 --- a/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/CityMapper.java +++ b/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/MybatisSpringNativeSampleApplication.java b/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/MybatisSpringNativeSampleApplication.java index 8ad8d04..0a0191f 100644 --- a/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/MybatisSpringNativeSampleApplication.java +++ b/samples/sqlprovider/src/main/java/org/mybatis/spring/nativex/sample/sqlprovider/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/sqlprovider/src/main/resources/application.properties b/samples/sqlprovider/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/sqlprovider/src/main/resources/application.properties +++ b/samples/sqlprovider/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/sqlprovider/src/main/resources/data.sql b/samples/sqlprovider/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/sqlprovider/src/main/resources/data.sql +++ b/samples/sqlprovider/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/sqlprovider/src/main/resources/schema.sql b/samples/sqlprovider/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/sqlprovider/src/main/resources/schema.sql +++ b/samples/sqlprovider/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/LICENSE_HEADER b/samples/thymeleaf-sqlgenerator/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/thymeleaf-sqlgenerator/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/thymeleaf-sqlgenerator/format.xml b/samples/thymeleaf-sqlgenerator/format.xml index 659bfa5..3c5c604 100644 --- a/samples/thymeleaf-sqlgenerator/format.xml +++ b/samples/thymeleaf-sqlgenerator/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/license.txt b/samples/thymeleaf-sqlgenerator/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/thymeleaf-sqlgenerator/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/thymeleaf-sqlgenerator/pom.xml b/samples/thymeleaf-sqlgenerator/pom.xml index 68e6ba5..db30bd0 100644 --- a/samples/thymeleaf-sqlgenerator/pom.xml +++ b/samples/thymeleaf-sqlgenerator/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/City.java b/samples/thymeleaf-sqlgenerator/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/City.java index 7d1fd47..7b81179 100644 --- a/samples/thymeleaf-sqlgenerator/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/City.java +++ b/samples/thymeleaf-sqlgenerator/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/MybatisSpringNativeSampleApplication.java b/samples/thymeleaf-sqlgenerator/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/MybatisSpringNativeSampleApplication.java index 9a728f4..1b34bc2 100644 --- a/samples/thymeleaf-sqlgenerator/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/MybatisSpringNativeSampleApplication.java +++ b/samples/thymeleaf-sqlgenerator/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/src/main/resources/application.properties b/samples/thymeleaf-sqlgenerator/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/thymeleaf-sqlgenerator/src/main/resources/application.properties +++ b/samples/thymeleaf-sqlgenerator/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/src/main/resources/data.sql b/samples/thymeleaf-sqlgenerator/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/thymeleaf-sqlgenerator/src/main/resources/data.sql +++ b/samples/thymeleaf-sqlgenerator/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/src/main/resources/schema.sql b/samples/thymeleaf-sqlgenerator/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/thymeleaf-sqlgenerator/src/main/resources/schema.sql +++ b/samples/thymeleaf-sqlgenerator/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/src/main/resources/sqls/city/city-findAll.sql b/samples/thymeleaf-sqlgenerator/src/main/resources/sqls/city/city-findAll.sql index d796ec6..71fe317 100644 --- a/samples/thymeleaf-sqlgenerator/src/main/resources/sqls/city/city-findAll.sql +++ b/samples/thymeleaf-sqlgenerator/src/main/resources/sqls/city/city-findAll.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/thymeleaf-sqlgenerator/src/main/resources/sqls/city/city-insert.sql b/samples/thymeleaf-sqlgenerator/src/main/resources/sqls/city/city-insert.sql index a4a6ed6..efdf2a1 100644 --- a/samples/thymeleaf-sqlgenerator/src/main/resources/sqls/city/city-insert.sql +++ b/samples/thymeleaf-sqlgenerator/src/main/resources/sqls/city/city-insert.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/LICENSE_HEADER b/samples/thymeleaf/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/thymeleaf/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/thymeleaf/format.xml b/samples/thymeleaf/format.xml index 659bfa5..3c5c604 100644 --- a/samples/thymeleaf/format.xml +++ b/samples/thymeleaf/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/license.txt b/samples/thymeleaf/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/thymeleaf/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/thymeleaf/pom.xml b/samples/thymeleaf/pom.xml index 2d49cfd..1ec0471 100644 --- a/samples/thymeleaf/pom.xml +++ b/samples/thymeleaf/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/City.java b/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/City.java index 7d1fd47..7b81179 100644 --- a/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/City.java +++ b/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper.java b/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper.java index 11e95cd..9fc9d43 100644 --- a/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper.java +++ b/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/MybatisSpringNativeSampleApplication.java b/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/MybatisSpringNativeSampleApplication.java index c1b3719..6abf19d 100644 --- a/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/MybatisSpringNativeSampleApplication.java +++ b/samples/thymeleaf/src/main/java/org/mybatis/spring/nativex/sample/thymeleaf/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/src/main/resources/application.properties b/samples/thymeleaf/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/thymeleaf/src/main/resources/application.properties +++ b/samples/thymeleaf/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/src/main/resources/data.sql b/samples/thymeleaf/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/thymeleaf/src/main/resources/data.sql +++ b/samples/thymeleaf/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/src/main/resources/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper/CityMapper-findAll.sql b/samples/thymeleaf/src/main/resources/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper/CityMapper-findAll.sql index d796ec6..71fe317 100644 --- a/samples/thymeleaf/src/main/resources/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper/CityMapper-findAll.sql +++ b/samples/thymeleaf/src/main/resources/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper/CityMapper-findAll.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/src/main/resources/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper/CityMapper-insert.sql b/samples/thymeleaf/src/main/resources/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper/CityMapper-insert.sql index a4a6ed6..efdf2a1 100644 --- a/samples/thymeleaf/src/main/resources/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper/CityMapper-insert.sql +++ b/samples/thymeleaf/src/main/resources/org/mybatis/spring/nativex/sample/thymeleaf/CityMapper/CityMapper-insert.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/thymeleaf/src/main/resources/schema.sql b/samples/thymeleaf/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/thymeleaf/src/main/resources/schema.sql +++ b/samples/thymeleaf/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/velocity/LICENSE_HEADER b/samples/velocity/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/velocity/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/velocity/format.xml b/samples/velocity/format.xml index 659bfa5..3c5c604 100644 --- a/samples/velocity/format.xml +++ b/samples/velocity/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/velocity/license.txt b/samples/velocity/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/velocity/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/velocity/pom.xml b/samples/velocity/pom.xml index 53a94d6..277359e 100644 --- a/samples/velocity/pom.xml +++ b/samples/velocity/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/City.java b/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/City.java index 0f1e47b..f6aa68b 100644 --- a/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/City.java +++ b/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/CityMapper.java b/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/CityMapper.java index e1209fb..e1b5f51 100644 --- a/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/CityMapper.java +++ b/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/MybatisSpringNativeSampleApplication.java b/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/MybatisSpringNativeSampleApplication.java index 3743f91..ab98cd0 100644 --- a/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/MybatisSpringNativeSampleApplication.java +++ b/samples/velocity/src/main/java/org/mybatis/spring/nativex/sample/velocity/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/velocity/src/main/resources/application.properties b/samples/velocity/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/velocity/src/main/resources/application.properties +++ b/samples/velocity/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/velocity/src/main/resources/data.sql b/samples/velocity/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/velocity/src/main/resources/data.sql +++ b/samples/velocity/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/velocity/src/main/resources/schema.sql b/samples/velocity/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/velocity/src/main/resources/schema.sql +++ b/samples/velocity/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/xml/LICENSE_HEADER b/samples/xml/LICENSE_HEADER new file mode 100644 index 0000000..a81590a --- /dev/null +++ b/samples/xml/LICENSE_HEADER @@ -0,0 +1,13 @@ + Copyright ${license.git.copyrightYears} 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. + 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. diff --git a/samples/xml/format.xml b/samples/xml/format.xml index 659bfa5..3c5c604 100644 --- a/samples/xml/format.xml +++ b/samples/xml/format.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/xml/license.txt b/samples/xml/license.txt deleted file mode 100644 index 5d63374..0000000 --- a/samples/xml/license.txt +++ /dev/null @@ -1,13 +0,0 @@ - Copyright ${license.git.copyrightYears} 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. - You may obtain a copy of the License at - - http://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. \ No newline at end of file diff --git a/samples/xml/pom.xml b/samples/xml/pom.xml index 7f3adf1..5e49f76 100644 --- a/samples/xml/pom.xml +++ b/samples/xml/pom.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/City.java b/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/City.java index 1cb3221..1c45e3a 100644 --- a/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/City.java +++ b/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/City.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/CityMapper.java b/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/CityMapper.java index 4ff58d1..a106540 100644 --- a/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/CityMapper.java +++ b/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/CityMapper.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/MybatisSpringNativeSampleApplication.java b/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/MybatisSpringNativeSampleApplication.java index b2cf2c7..e74981e 100644 --- a/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/MybatisSpringNativeSampleApplication.java +++ b/samples/xml/src/main/java/org/mybatis/spring/nativex/sample/xml/MybatisSpringNativeSampleApplication.java @@ -5,7 +5,7 @@ * 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 "AS IS" BASIS, diff --git a/samples/xml/src/main/resources/application.properties b/samples/xml/src/main/resources/application.properties index 8a919d6..761337e 100644 --- a/samples/xml/src/main/resources/application.properties +++ b/samples/xml/src/main/resources/application.properties @@ -5,7 +5,7 @@ # 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 "AS IS" BASIS, diff --git a/samples/xml/src/main/resources/data.sql b/samples/xml/src/main/resources/data.sql index a11c078..7eb08e9 100644 --- a/samples/xml/src/main/resources/data.sql +++ b/samples/xml/src/main/resources/data.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS, diff --git a/samples/xml/src/main/resources/org/mybatis/spring/nativex/sample/xml/CityMapper.xml b/samples/xml/src/main/resources/org/mybatis/spring/nativex/sample/xml/CityMapper.xml index fc28dcc..0242748 100644 --- a/samples/xml/src/main/resources/org/mybatis/spring/nativex/sample/xml/CityMapper.xml +++ b/samples/xml/src/main/resources/org/mybatis/spring/nativex/sample/xml/CityMapper.xml @@ -7,7 +7,7 @@ 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 "AS IS" BASIS, diff --git a/samples/xml/src/main/resources/schema.sql b/samples/xml/src/main/resources/schema.sql index d50bba4..ef5ac0d 100644 --- a/samples/xml/src/main/resources/schema.sql +++ b/samples/xml/src/main/resources/schema.sql @@ -5,7 +5,7 @@ -- 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 "AS IS" BASIS,