Skip to content

Commit 7e510f8

Browse files
Merge branch 'main' into beta/pipelinebuild/251993
2 parents c3d1ff8 + 84e1d6c commit 7e510f8

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎.github/workflows/conflicting-pr-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Steps represent a sequence of tasks that will be executed as part of the job
2222
steps:
2323
- name: check if prs are dirty
24-
uses: eps1lon/actions-label-merge-conflict@releases/2.x
24+
uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
2525
if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null
2626
id: check
2727
with:

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
5959
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
6060
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
61-
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
61+
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
6262
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
6363
</properties>
6464

0 commit comments

Comments
 (0)