Skip to content

Commit

Permalink
Merge pull request mybatis#164 from hazendaz/master
Browse files Browse the repository at this point in the history
Update site distro and also build with jdk 22
  • Loading branch information
hazendaz committed Nov 3, 2023
2 parents 674ce8c + 256fbb7 commit 58279e3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 70 deletions.
22 changes: 3 additions & 19 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
#
# Copyright 2016-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]
Expand All @@ -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 }}
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/coveralls.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
#
# Copyright 2016-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]
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/sonar.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
#
# Copyright 2016-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:
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/sonatype.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
#
# Copyright 2016-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:
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<scm>
<url>https://github.com/mybatis/caffeine-cache</url>
<connection>scm:git:ssh://github.com/mybatis/caffeine-cache.git</connection>
<connection>scm:git:ssh://git@github.com/mybatis/caffeine-cache.git</connection>
<developerConnection>scm:git:ssh://git@github.com/mybatis/caffeine-cache.git</developerConnection>
<tag>HEAD</tag>
</scm>
Expand All @@ -53,9 +53,9 @@
</ciManagement>
<distributionManagement>
<site>
<id>gh-pages</id>
<id>gh-pages-scm</id>
<name>Mybatis GitHub Pages</name>
<url>git:ssh://git@github.com/mybatis/caffeine-cache.git?gh-pages#</url>
<url>scm:git:ssh://git@github.com/mybatis/caffeine-cache.git</url>
</site>
</distributionManagement>

Expand Down

0 comments on commit 58279e3

Please sign in to comment.