Skip to content

Commit 7eaad56

Browse files
chore: merge release-1.x into dev-1.x [skip ci]
2 parents e7198c5 + e97b2ad commit 7eaad56

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/maven-publish.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
--update-snapshots
5252
--file pom.xml
5353
-Drevision=${{ inputs.revision }}
54+
-Dtomcat.version=9.0.117
5455
-Dgpg.skip=true
5556
deploy
5657
--activate-profiles publish,ci
@@ -127,4 +128,4 @@ jobs:
127128
echo "::error::Merge conflict detected when merging release-1.x into dev-1.x. Manual intervention required."
128129
exit 1
129130
fi
130-
git push origin dev-1.x
131+
git push origin dev-1.x

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</scm>
5353

5454
<properties>
55-
<revision>0.1.9-SNAPSHOT</revision>
55+
<revision>0.1.10-SNAPSHOT</revision>
5656
</properties>
5757

5858
<modules>

0 commit comments

Comments
 (0)