Merge pull request #908 from hazendaz/master

Build updates and use new site distro
mybatis · Nov 8, 2023 · aee6f8c · aee6f8c
2 parents 977ad3b + 4e2ea53
commit aee6f8c
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 169 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,38 +1,22 @@
-#
-#    Copyright 2015-2023 the original author or authors.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    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.
-#
-
 name: Java CI
 
-on: [push, pull_request]
+on: [workflow_dispatch, push, pull_request]
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [17, 21]
-        distribution: ['zulu']
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        java: [17, 21, 22-ea]
+        distribution: ['temurin']
       fail-fast: false
-      max-parallel: 5
+      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 }}

diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -1,19 +1,3 @@
-#
-#    Copyright 2015-2020 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.
-#
-
 name: Coveralls
 
 on: [push, pull_request]
@@ -27,16 +11,16 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Report Coverage to Coveralls for Pull Requests
         if: github.event_name == 'pull_request'
-        run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
+        run: ./mvnw -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 -B -V 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/sonar.yaml b/.github/workflows/sonar.yaml
@@ -1,19 +1,3 @@
-#
-#    Copyright 2015-2020 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.
-#
-
 name: SonarCloud
 
 on:

diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
@@ -1,19 +1,3 @@
-#
-#    Copyright 2015-2020 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.
-#
-
 name: Sonatype
 
 on:

diff --git a/mybatis-spring-boot-autoconfigure/pom.xml b/mybatis-spring-boot-autoconfigure/pom.xml
@@ -92,7 +92,7 @@
       <artifactId>spring-boot-configuration-processor</artifactId>
       <optional>true</optional>
     </dependency>
-    
+
     <!-- Test dependencies -->
     <dependency>
       <groupId>com.h2database</groupId>

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/pom.xml
@@ -58,8 +58,6 @@
     </dependency>
   </dependencies>
   <build>
-    <sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
-    <testSourceDirectory>${project.basedir}/src/test/groovy</testSourceDirectory>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -106,5 +104,7 @@
         </executions>
       </plugin>
     </plugins>
+    <sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
+    <testSourceDirectory>${project.basedir}/src/test/groovy</testSourceDirectory>
   </build>
 </project>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/pom.xml
@@ -61,8 +61,6 @@
     </dependency>
   </dependencies>
   <build>
-    <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-    <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
@@ -100,20 +98,22 @@
         <executions>
           <execution>
             <id>compile</id>
-            <phase>compile</phase>
             <goals>
               <goal>compile</goal>
             </goals>
+            <phase>compile</phase>
           </execution>
           <execution>
             <id>test-compile</id>
-            <phase>test-compile</phase>
             <goals>
               <goal>test-compile</goal>
             </goals>
+            <phase>test-compile</phase>
           </execution>
         </executions>
       </plugin>
     </plugins>
+    <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+    <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
   </build>
 </project>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/pom.xml
@@ -96,22 +96,6 @@
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-maven3-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>start-container</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>stop-container</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>stop</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <configuration>
             <properties>
@@ -129,6 +113,22 @@
             <output>${project.build.directory}/cargo/container.log</output>
           </container>
         </configuration>
+        <executions>
+          <execution>
+            <id>start-container</id>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <phase>pre-integration-test</phase>
+          </execution>
+          <execution>
+            <id>stop-container</id>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+            <phase>post-integration-test</phase>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/pom.xml
@@ -59,12 +59,12 @@
         <version>${spring-boot.version}</version>
         <executions>
           <execution>
-          <goals>
-            <goal>repackage</goal>
-          </goals>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
           </execution>
         </executions>
-    </plugin>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/mybatis-spring-boot-starter-test/pom.xml b/mybatis-spring-boot-starter-test/pom.xml
@@ -19,8 +19,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mybatis-spring-boot</artifactId>
     <groupId>org.mybatis.spring.boot</groupId>
+    <artifactId>mybatis-spring-boot</artifactId>
     <version>3.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-starter-test</artifactId>

diff --git a/mybatis-spring-boot-test-autoconfigure/pom.xml b/mybatis-spring-boot-test-autoconfigure/pom.xml
@@ -19,8 +19,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mybatis-spring-boot</artifactId>
     <groupId>org.mybatis.spring.boot</groupId>
+    <artifactId>mybatis-spring-boot</artifactId>
     <version>3.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>mybatis-spring-boot-test-autoconfigure</artifactId>