Skip to content

Commit 1e4ca79

Browse files
committed
Merge branch '2.19'
2 parents 5fe4e2d + c8951d0 commit 1e4ca79

File tree

2 files changed

+29
-11
lines changed

2 files changed

+29
-11
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@ permissions:
2222

2323
jobs:
2424
build:
25-
runs-on: ${{ matrix.os }}
25+
runs-on: 'ubuntu-20.04'
2626
strategy:
2727
fail-fast: false
2828
matrix:
2929
java_version: ['8', '11', '17', '21']
30-
os: ['ubuntu-20.04']
30+
include:
31+
- java_version: '8'
32+
- release_build: 'R'
3133
env:
3234
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
3335
steps:
34-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3537
- name: Set up JDK
36-
uses: actions/setup-java@v3
38+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
3739
with:
3840
distribution: 'temurin'
3941
java-version: ${{ matrix.java_version }}
@@ -48,20 +50,20 @@ jobs:
4850
run: ./mvnw -B -q -ff -ntp verify
4951
- name: Extract project Maven version
5052
id: projectVersion
51-
run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
53+
run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
5254
- name: Deploy snapshot
53-
if: github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
55+
if: ${{ matrix.release_build && github.event_name != 'pull_request' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
5456
env:
5557
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME3 }}
5658
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD3 }}
5759
# MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5860
run: ./mvnw -B -q -ff -DskipTests -ntp source:jar deploy
5961
- name: Generate code coverage
60-
if: github.event_name != 'pull_request' && matrix.java_version == '8'
62+
if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
6163
run: ./mvnw -B -q -ff -ntp test
6264
- name: Publish code coverage
63-
if: github.event_name != 'pull_request' && matrix.java_version == '8'
64-
uses: codecov/codecov-action@v1
65+
if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
66+
uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
6567
with:
6668
token: ${{ secrets.CODECOV_TOKEN }}
6769
file: ./target/site/jacoco/jacoco.xml
Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,18 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar

0 commit comments

Comments
 (0)