diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 318642c..fdfb248 100644 --- a/.github/workflows/ci.yaml +++ b/.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 }} diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 97b4b0d..0f79506 100644 --- a/.github/workflows/sonar.yaml +++ b/.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: diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index a0b20f1..46800b4 100644 --- a/.github/workflows/sonatype.yaml +++ b/.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: diff --git a/pom.xml b/pom.xml index 22d8cd7..a133dd4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ + org.mybatis base-bundle-descriptor 11-SNAPSHOT @@ -36,7 +37,7 @@ https://github.com/mybatis/base-bundle-descriptor - scm:git:ssh://github.com/mybatis/base-bundle-descriptor.git + scm:git:ssh://git@github.com/mybatis/base-bundle-descriptor.git scm:git:ssh://git@github.com/mybatis/base-bundle-descriptor.git HEAD @@ -50,9 +51,9 @@ - gh-pages + gh-pages-scm Mybatis GitHub Pages - git:ssh://git@github.com/mybatis/base-bundle-descriptor.git?gh-pages# + scm:git:ssh://git@github.com/mybatis/base-bundle-descriptor.git diff --git a/src/main/resources-unfiltered/assemblies/base-bundle.xml b/src/main/resources-unfiltered/assemblies/base-bundle.xml index 8c5ebe6..8c656ee 100644 --- a/src/main/resources-unfiltered/assemblies/base-bundle.xml +++ b/src/main/resources-unfiltered/assemblies/base-bundle.xml @@ -1,7 +1,7 @@