diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 97e81af..eba432c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,28 +1,26 @@ name: Java CI -on: - push: - pull_request: + +on: [workflow_dispatch, push, pull_request] + jobs: - build: - name: Verify on ${{ matrix.os }} (Java ${{ matrix.java }}) + test: runs-on: ${{ matrix.os }} strategy: matrix: - os: - - 'ubuntu-latest' - - 'windows-latest' - - 'macos-latest' - java: - - 21 + os: [ubuntu-latest, macos-latest, windows-latest] + java: [17] + distribution: ['temurin'] fail-fast: false - max-parallel: 6 + max-parallel: 4 + name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} + steps: - uses: actions/checkout@v4 - - name: Set up JDK + - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }} uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} - distribution: 'zulu' + distribution: ${{ matrix.distribution }} - name: Cache local Maven repository uses: actions/cache@v3 with: @@ -30,7 +28,5 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Show a Java version - run: java -version - - name: Verify a mybatis-spring-native-core - run: ./mvnw -U -pl .,core,extensions clean verify -D"license.skip=true" + - name: Test with Maven + run: ./mvnw -pl core,extensions test -B -V --no-transfer-progress -D"license.skip=true" diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 023d797..c8d5254 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -1,5 +1,7 @@ name: Coveralls + on: [push, pull_request] + jobs: build: if: github.repository_owner == 'mybatis' @@ -9,7 +11,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 21 + java-version: 17 distribution: zulu - name: Cache local Maven repository uses: actions/cache@v3 @@ -20,12 +22,12 @@ jobs: ${{ runner.os }}-maven- - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' - run: ./mvnw -pl core,extensions test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER + run: ./mvnw -pl core,extensions -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ github.event.number }} - name: Report Coverage to Coveralls for General Push if: github.event_name == 'push' - run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github + run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index ea37c7d..177b2ca 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -12,7 +12,7 @@ jobs: - 'ubuntu-latest' - 'windows-latest' java: - - 21 + - 17 sample: - 'simple' - 'xml' @@ -51,7 +51,7 @@ jobs: java --version native-image --version - name: Build native image - run: ./mvnw -pl core,extensions,samples/${{ matrix.sample }} -U -D"maven.test.skip" -Pnative -D"license.skip=true" clean package + run: ./mvnw -pl core,extensions,samples/${{ matrix.sample }} -U -D"maven.test.skip" -Pnative -D"license.skip=true" clean package -B -V --no-transfer-progress - name: Run with native image run: ./samples/${{ matrix.sample }}/target/mybatis-spring-native-sample-${{ matrix.sample }} - name: Run with executable jar on AOT mode diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 08f2cbe..256e71f 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -1,8 +1,10 @@ name: SonarCloud + on: push: branches: - master + jobs: build: if: github.repository_owner == 'mybatis' @@ -15,7 +17,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 21 + java-version: 17 distribution: zulu - name: Cache local Maven repository uses: actions/cache@v3 @@ -25,7 +27,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Analyze with SonarCloud - run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring-native -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true + run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring-native -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 9ad6b60..6c801aa 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -1,8 +1,10 @@ name: Sonatype + on: push: branches: - master + jobs: build: if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') @@ -12,7 +14,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 21 + java-version: 17 distribution: zulu - name: Cache local Maven repository uses: actions/cache@v3 @@ -22,7 +24,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Deploy to Sonatype - run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true + run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true env: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index c8af479..3be5765 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,7 +1,7 @@ - gh-pages + gh-pages-scm + + branch + gh-pages + github diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java index 732313c..f57fd86 100644 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -23,85 +23,50 @@ 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 String WRAPPER_VERSION = "3.2.0"; 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( "Apache Maven Wrapper Downloader " + WRAPPER_VERSION ); - 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 ) ) + if ( args.length != 2 ) { - System.err.println( " - ERROR projectBasedir not exists: " + projectBasedir ); + System.err.println( " - ERROR wrapperUrl or wrapperJarPath parameter missing" ); 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( " - Downloader started" ); + final URL wrapperUrl = new URL( args[0] ); + final String jarPath = args[1].replace( "..", "" ); // Sanitize path + final Path wrapperJarPath = Paths.get( jarPath ).toAbsolutePath().normalize(); + downloadFileFromURL( wrapperUrl, wrapperJarPath ); log( "Done" ); - System.exit( 0 ); } catch ( IOException e ) { - System.err.println( "- Error downloading" ); - e.printStackTrace(); + System.err.println( "- Error downloading: " + e.getMessage() ); + if ( VERBOSE ) + { + e.printStackTrace(); + } System.exit( 1 ); } } - private static void downloadFileFromURL( String urlString, Path destination ) throws IOException + private static void downloadFileFromURL( URL wrapperUrl, Path wrapperJarPath ) + throws IOException { - log( " - Downloading to: " + destination ); + log( " - Downloading to: " + wrapperJarPath ); if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null ) { final String username = System.getenv( "MVNW_USERNAME" ); @@ -115,40 +80,11 @@ protected PasswordAuthentication getPasswordAuthentication() } } ); } - 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 ) ) + try ( InputStream inStream = wrapperUrl.openStream() ) { - 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 + "'" ); - } + Files.copy( inStream, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING ); } - log( " - Downloading from: " + url ); - return url; + log( " - Downloader complete" ); } private static void log( String msg ) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index eacdc9e..39a584e 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -6,7 +6,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..2c94581 --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +MyBatis Spring Native +Copyright 2022-2023 + +This product includes software developed by +The MyBatis Team (https://www.mybatis.org/). diff --git a/core/pom.xml b/core/pom.xml index e35b196..17102f5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -27,8 +26,8 @@ mybatis-spring-native-core - MyBatis integration with Spring Native feature for core modules mybatis-spring-native-core + MyBatis integration with Spring Native feature for core modules org.mybatis.spring.nativex.core 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 d35c48a..c1ad9ab 100644 --- a/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesHolder.java +++ b/core/src/main/java/org/mybatis/spring/nativex/MyBatisScannedResourcesHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/core/src/test/gradle_resources/mapper/gradle_output/GradleOutputMapper.xml b/core/src/test/gradle_resources/mapper/gradle_output/GradleOutputMapper.xml index 3e29c3c..fd06057 100644 --- a/core/src/test/gradle_resources/mapper/gradle_output/GradleOutputMapper.xml +++ b/core/src/test/gradle_resources/mapper/gradle_output/GradleOutputMapper.xml @@ -1,13 +1,13 @@ - + 4.0.0 @@ -27,8 +26,8 @@ mybatis-spring-native-docs - Documents for MyBatis integration with Spring Native feature mybatis-spring-native-docs + Documents for MyBatis integration with Spring Native feature org.mybatis.spring.nativex.docs diff --git a/extensions/pom.xml b/extensions/pom.xml index 74b13df..a94470c 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -27,8 +26,8 @@ mybatis-spring-native-extensions - MyBatis integration with Spring Native feature for extension modules(scripting, cache, and more) mybatis-spring-native-extensions + MyBatis integration with Spring Native feature for extension modules(scripting, cache, and more) org.mybatis.spring.nativex.extensions diff --git a/mvnw b/mvnw index 8d937f4..66df285 100755 --- a/mvnw +++ b/mvnw @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an diff --git a/mvnw.cmd b/mvnw.cmd index c4586b5..95ba6f5 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -7,7 +7,7 @@ @REM "License"); you may not use this file except in compliance @REM with the License. You may obtain a copy of the License at @REM -@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM https://www.apache.org/licenses/LICENSE-2.0 @REM @REM Unless required by applicable law or agreed to in writing, @REM software distributed under the License is distributed on an diff --git a/pom.xml b/pom.xml index 85f14d5..84ef447 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -37,11 +36,25 @@ https://www.mybatis.org/spring-native/ 2022 + + + Kazuki Shimizu + kazuki43zoo@gmail.com + + + + + core + extensions + samples + docs + + scm:git:git@github.com:mybatis/spring-native.git scm:git:git@github.com:mybatis/spring-native.git - https://github.com/mybatis/spring-native/tree/master HEAD + https://github.com/mybatis/spring-native/tree/master GitHub Issue Management @@ -53,26 +66,12 @@ - gh-pages + gh-pages-scm Mybatis GitHub Pages - git:ssh://git@github.com/mybatis/spring-native.git?gh-pages# + scm:git:git@github.com:mybatis/spring-native.git - - - Kazuki Shimizu - kazuki43zoo@gmail.com - - - - - core - extensions - samples - docs - - 11 @@ -93,33 +92,6 @@ 1757561022 - - - - ${project.basedir}/src/main/resources - true - - - ${project.basedir}/src/site - ${project.build.directory}/site-src - true - - - - - - org.apache.maven.plugins - maven-site-plugin - - en,zh_CN,ko - - ${project.build.directory}/site-src - - - - - - @@ -189,55 +161,82 @@ https://oss.sonatype.org/content/repositories/snapshots + + false + spring-releases Spring Releases https://repo.spring.io/release + + false - - spring-milestone Spring Milestone https://repo.spring.io/milestone - - false - - spring-snapshot - Spring Snapshot - https://repo.spring.io/snapshot true + spring-snapshot + Spring Snapshot + https://repo.spring.io/snapshot + + false + spring-releases Spring Releases https://repo.spring.io/release + + false - - spring-milestone Spring Milestone https://repo.spring.io/milestone - - false - - spring-snapshot - Spring Snapshot - https://repo.spring.io/snapshot true + spring-snapshot + Spring Snapshot + https://repo.spring.io/snapshot + + + + true + ${project.basedir}/src/main/resources + + + ${project.build.directory}/site-src + true + ${project.basedir}/src/site + + + + + + org.apache.maven.plugins + maven-site-plugin + + en,zh_CN,ko + + ${project.build.directory}/site-src + + + + + + diff --git a/samples/cache/pom.xml b/samples/cache/pom.xml index 94694b4..7d807e3 100644 --- a/samples/cache/pom.xml +++ b/samples/cache/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -63,14 +62,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -81,6 +72,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -131,17 +130,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/configuration/pom.xml b/samples/configuration/pom.xml index 373173f..5d3223d 100644 --- a/samples/configuration/pom.xml +++ b/samples/configuration/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -63,14 +62,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -81,6 +72,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -126,17 +125,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/dao/pom.xml b/samples/dao/pom.xml index c88a9cb..8c604a7 100644 --- a/samples/dao/pom.xml +++ b/samples/dao/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -63,14 +62,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -81,6 +72,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -126,17 +125,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/dynamic-sql/pom.xml b/samples/dynamic-sql/pom.xml index ddb5e5c..3dff393 100644 --- a/samples/dynamic-sql/pom.xml +++ b/samples/dynamic-sql/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -67,14 +66,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -85,6 +76,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -130,17 +129,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/freemarker/pom.xml b/samples/freemarker/pom.xml index 94e2927..c5bdb1b 100644 --- a/samples/freemarker/pom.xml +++ b/samples/freemarker/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -67,14 +66,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -85,6 +76,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -130,17 +129,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/pom.xml b/samples/pom.xml index 964be88..0631326 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -27,17 +26,8 @@ mybatis-spring-native-samples - mybatis-spring-native-samples pom - - - true - true - true - true - - 0.9.28 - + mybatis-spring-native-samples cache @@ -54,6 +44,15 @@ xml + + true + true + true + true + + 0.9.28 + + @@ -70,6 +69,8 @@ + + ${project.artifactId} @@ -80,7 +81,5 @@ - - ${project.artifactId} diff --git a/samples/scan/pom.xml b/samples/scan/pom.xml index 7374abf..dc94cfd 100644 --- a/samples/scan/pom.xml +++ b/samples/scan/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -63,14 +62,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -81,6 +72,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -126,17 +125,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/simple/pom.xml b/samples/simple/pom.xml index f9e3ca1..3563e07 100644 --- a/samples/simple/pom.xml +++ b/samples/simple/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -63,14 +62,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -81,6 +72,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -126,17 +125,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/sqlprovider/pom.xml b/samples/sqlprovider/pom.xml index a460410..e20e23d 100644 --- a/samples/sqlprovider/pom.xml +++ b/samples/sqlprovider/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -63,14 +62,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -81,6 +72,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -126,17 +125,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/thymeleaf-sqlgenerator/pom.xml b/samples/thymeleaf-sqlgenerator/pom.xml index 428f74d..caf5c4a 100644 --- a/samples/thymeleaf-sqlgenerator/pom.xml +++ b/samples/thymeleaf-sqlgenerator/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -67,14 +66,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -85,6 +76,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -130,17 +129,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/thymeleaf/pom.xml b/samples/thymeleaf/pom.xml index 7784a80..1509de6 100644 --- a/samples/thymeleaf/pom.xml +++ b/samples/thymeleaf/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -67,14 +66,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -85,6 +76,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -130,17 +129,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/velocity/pom.xml b/samples/velocity/pom.xml index 77f4c44..e6dcd7c 100644 --- a/samples/velocity/pom.xml +++ b/samples/velocity/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -67,14 +66,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -85,6 +76,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -130,17 +129,17 @@ test-native - test test + test build-native - package build + package diff --git a/samples/xml/pom.xml b/samples/xml/pom.xml index aa1b4eb..25bda7c 100644 --- a/samples/xml/pom.xml +++ b/samples/xml/pom.xml @@ -16,8 +16,7 @@ limitations under the License. --> - + 4.0.0 @@ -63,14 +62,6 @@ org.springframework.boot spring-boot-maven-plugin ${spring-boot.version} - - - repackage - - repackage - - - ${repackage.classifier} true @@ -81,6 +72,14 @@ + + + repackage + + repackage + + + org.springframework.experimental @@ -126,17 +125,17 @@ test-native - test test + test build-native - package build + package