Skip to content

Commit cbd8364

Browse files
committed
Merge branch '2.13' into 2.14
2 parents 1fd7e42 + 65e5a5a commit cbd8364

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

.github/workflows/main.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ on:
1212
pull_request:
1313
branches:
1414
- master
15+
- "3.0"
1516
- "2.14"
17+
- "2.13"
1618
paths-ignore:
1719
- "README.md"
1820
- "release-notes/*"
@@ -33,16 +35,22 @@ jobs:
3335
with:
3436
distribution: 'temurin'
3537
java-version: ${{ matrix.java_version }}
36-
cache : 'maven'
38+
cache: 'maven'
3739
server-id: sonatype-nexus-snapshots
3840
server-username: CI_DEPLOY_USERNAME
3941
server-password: CI_DEPLOY_PASSWORD
42+
# See https://github.com/actions/setup-java/blob/v2/docs/advanced-usage.md#Publishing-using-Apache-
43+
# gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
44+
# gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
4045
- name: Build
41-
run: ./mvnw -V -B -ff -ntp verify
46+
run: ./mvnw -B -q -ff -ntp verify
47+
- name: Extract project Maven version
48+
id: projectVersion
49+
run: echo ::set-output name=version::$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -DforceStdout -Dexpression=project.version -q)
4250
- name: Deploy snapshot
43-
if: github.event_name != 'pull_request' && matrix.java_version == '8'
51+
if: github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
4452
env:
4553
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
4654
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
4755
# MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
48-
run: ./mvnw -V -B -ff -DskipTests -ntp source:jar deploy
56+
run: ./mvnw -B -q -ff -DskipTests -ntp source:jar deploy

release-notes/VERSION-2.x

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Co-maintainers:
1818

1919
No changes since 2.13
2020

21+
2.13.3 (14-May-2022)
22+
23+
No changes since 2.13.2
24+
2125
2.13.2 (17-Mar-2022) -- delayed due to compatibility issues, compared
2226
to other components that were released on (06-Mar-2022)
2327

0 commit comments

Comments
 (0)