Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pct
Browse files Browse the repository at this point in the history
# Conflicts:
#	ui-tests/pom.xml
  • Loading branch information
uhafner committed Aug 10, 2022
2 parents 1d7d282 + 5e40665 commit 9b0da3d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jvnet.hudson.plugins</groupId>
<artifactId>analysis-pom</artifactId>
<version>5.32.0</version>
<version>5.33.0</version>
<relativePath />
</parent>

Expand All @@ -25,7 +25,7 @@
<changelist>-SNAPSHOT</changelist>
<module.name>${project.groupId}.warnings.ng</module.name>

<analysis-model-api.version>10.15.0</analysis-model-api.version>
<analysis-model-api.version>10.16.0</analysis-model-api.version>
<analysis-model-tests.version>${analysis-model-api.version}</analysis-model-tests.version>
<pull-request-monitoring.version>1.7.8</pull-request-monitoring.version>
<prism-api.version>1.28.0-2</prism-api.version>
Expand Down
2 changes: 1 addition & 1 deletion ui-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<name>UI Tests of Warnings Plugin</name>

<properties>
<jenkins.version>2.362</jenkins.version>
<jenkins.version>2.363</jenkins.version>
<hpi-plugin.version>3.32</hpi-plugin.version>
<json-smart.version>2.3</json-smart.version>
<json-unit-assertj.version>2.35.0</json-unit-assertj.version>
Expand Down

0 comments on commit 9b0da3d

Please sign in to comment.