From 5bb43d12b711f0249b15241d1b023abfa0343a6d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 3 Nov 2023 19:35:03 -0400 Subject: [PATCH 1/2] [pom] Prepare for new site distro --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1ab9954..0b5331e 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ org.mybatis.caches mybatis-ehcache 1.2.4-SNAPSHOT - jar mybatis-ehcache Ehcache support for MyBatis Cache @@ -38,7 +37,7 @@ http://github.com/mybatis/ehcache-cache - scm:git:ssh://github.com/mybatis/ehcache-cache.git + scm:git:ssh://git@github.com/mybatis/ehcache-cache.git scm:git:ssh://git@github.com/mybatis/ehcache-cache.git HEAD @@ -52,9 +51,9 @@ - gh-pages + gh-pages-scm Mybatis GitHub Pages - git:ssh://git@github.com/mybatis/ehcache-cache.git?gh-pages# + scm:git:ssh://git@github.com/mybatis/ehcache-cache.git From 81cf4ef8a48ad3224df0a4348768b88ae477111e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Fri, 3 Nov 2023 19:36:50 -0400 Subject: [PATCH 2/2] [GHA] Update github actions --- .github/workflows/ci.yaml | 22 +++------------------- .github/workflows/coveralls.yaml | 16 ---------------- .github/workflows/sonar.yaml | 16 ---------------- .github/workflows/sonatype.yaml | 16 ---------------- 4 files changed, 3 insertions(+), 67 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ec19289..31dee44 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/coveralls.yaml b/.github/workflows/coveralls.yaml index a945506..038d881 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.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: Coveralls on: [push, pull_request] diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 2c6e9fe..1eb1d66 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: