Merge pull request #92 from hazendaz/master

Update site distro and use jdk 22

.github/workflows/ci.yaml

@@ -1,19 +1,3 @@
-#
-#    Copyright 2010-2021 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]
@@ -23,9 +7,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 21]
-        distribution: ['zulu']
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        java: [11, 17, 21, 22-ea]
+        distribution: ['temurin']
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}

.github/workflows/sonar.yaml

@@ -1,19 +1,3 @@
-#
-#    Copyright 2010-2021 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:

.github/workflows/sonatype.yaml

@@ -1,19 +1,3 @@
-#
-#    Copyright 2010-2021 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:

pom.xml

@@ -27,6 +27,7 @@
     <relativePath />
   </parent>
 
+  <groupId>org.mybatis</groupId>
   <artifactId>base-bundle-descriptor</artifactId>
   <version>11-SNAPSHOT</version>
 
@@ -36,7 +37,7 @@
 
   <scm>
     <url>https://github.com/mybatis/base-bundle-descriptor</url>
-    <connection>scm:git:ssh://github.com/mybatis/base-bundle-descriptor.git</connection>
+    <connection>scm:git:ssh://git@github.com/mybatis/base-bundle-descriptor.git</connection>
     <developerConnection>scm:git:ssh://[email protected]/mybatis/base-bundle-descriptor.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
@@ -50,9 +51,9 @@
   </ciManagement>
   <distributionManagement>
     <site>
-      <id>gh-pages</id>
+      <id>gh-pages-scm</id>
       <name>Mybatis GitHub Pages</name>
-      <url>git:ssh://[email protected]/mybatis/base-bundle-descriptor.git?gh-pages#</url>
+      <url>scm:git:ssh://[email protected]/mybatis/base-bundle-descriptor.git</url>
     </site>
   </distributionManagement>
 

src/main/resources-unfiltered/assemblies/base-bundle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2010-2022 the original author or authors.
+       Copyright 2010-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.