Skip to content

Commit 6dc18b3

Browse files
Bump com.arpnetworking.build:arpnetworking-parent-pom from 3.3.9 to 3.4.2 (#809)
* Bump com.arpnetworking.build:arpnetworking-parent-pom Bumps [com.arpnetworking.build:arpnetworking-parent-pom](https://github.com/arpnetworking/arpnetworking-parent-pom) from 3.3.9 to 3.4.2. - [Release notes](https://github.com/arpnetworking/arpnetworking-parent-pom/releases) - [Commits](ArpNetworking/arpnetworking-parent-pom@arpnetworking-parent-pom-3.3.9...arpnetworking-parent-pom-3.4.2) --- updated-dependencies: - dependency-name: com.arpnetworking.build:arpnetworking-parent-pom dependency-version: 3.4.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * migrate from OSSRH to central * try catching the cancelation exception --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brandon Arp <[email protected]>
1 parent 059b70e commit 6dc18b3

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pipeline {
4242
stage('Build') {
4343
steps {
4444
withCredentials([usernamePassword(credentialsId: 'jenkins-dockerhub', usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD'),
45-
usernamePassword(credentialsId: 'jenkins-ossrh', usernameVariable: 'OSSRH_USER', passwordVariable: 'OSSRH_PASS'),
45+
usernamePassword(credentialsId: 'jenkins-central', usernameVariable: 'CENTRAL_USER', passwordVariable: 'CENTRAL_PASS'),
4646
string(credentialsId: 'jenkins-gpg', variable: 'GPG_PASS')]) {
4747
withMaven {
4848
sh "./jdk-wrapper.sh ./mvnw $target -P rpm -U -B -Dstyle.color=always -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Ddocker.verbose=true"

app/com/arpnetworking/metrics/portal/reports/impl/chrome/BaseScreenshotRenderer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import java.net.URI;
3030
import java.time.Duration;
31+
import java.util.concurrent.CancellationException;
3132
import java.util.concurrent.CompletableFuture;
3233
import java.util.concurrent.CompletionStage;
3334
import java.util.concurrent.ScheduledExecutorService;
@@ -138,7 +139,11 @@ public ImmutableList<Problem> validateRender(final S source, final F format) {
138139
.addData("result", x)
139140
.log();
140141
}
141-
navigate.cancel(true);
142+
try {
143+
navigate.cancel(true);
144+
} catch (final CancellationException ignored) {
145+
// Future was already cancelled, which is fine
146+
}
142147
} finally {
143148
dts.close();
144149
LOGGER.debug()

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>com.arpnetworking.build</groupId>
2020
<artifactId>arpnetworking-parent-pom</artifactId>
21-
<version>3.3.9</version>
21+
<version>3.4.2</version>
2222
<relativePath />
2323
</parent>
2424

settings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<settings>
22
<servers>
33
<server>
4-
<id>ossrh</id>
5-
<username>${env.OSSRH_USER}</username>
6-
<password>${env.OSSRH_PASS}</password>
4+
<id>central</id>
5+
<username>${env.CENTRAL_USER}</username>
6+
<password>${env.CENTRAL_PASS}</password>
77
</server>
88
<server>
99
<id>arpnet</id>

0 commit comments

Comments
 (0)