diff options
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java | 2 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 5 | ||||
| -rw-r--r-- | hosted-tenant-base/pom.xml | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java index f28b21228d9..897e0be2d22 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java @@ -37,7 +37,7 @@ public record Notification(Instant at, Notification.Type type, Notification.Leve Objects.requireNonNull(level, "level cannot be null"); Objects.requireNonNull(source, "source cannot be null"); Objects.requireNonNull(title, "title cannot be null"); - List.copyOf(Objects.requireNonNull(messages, "messages cannot be null")); + messages = List.copyOf(Objects.requireNonNull(messages, "messages cannot be null")); // Allowing empty title temporarily until all notifications have a title // if (title.isBlank()) throw new IllegalArgumentException("title cannot be empty"); diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index ae96f97e1d2..31054a86fd9 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -140,6 +140,7 @@ <!-- CAUTION: upgrading junit for tenants poms may break testing frameworks --> <junit.vespa.tenant.version>5.8.1</junit.vespa.tenant.version> <junit.platform.vespa.tenant.version>1.8.1</junit.platform.vespa.tenant.version> + <surefire.vespa.tenant.version>${surefire.vespa.version}</surefire.vespa.tenant.version> <!-- Maven plugins --> <clover-maven-plugin.vespa.version>4.5.0</clover-maven-plugin.vespa.version> @@ -148,10 +149,10 @@ <maven-bundle-plugin.vespa.version>5.1.9</maven-bundle-plugin.vespa.version> <maven-compiler-plugin.vespa.version>3.11.0</maven-compiler-plugin.vespa.version> <maven-core.vespa.version>3.9.5</maven-core.vespa.version> - <maven-dependency-plugin.vespa.version>3.6.0</maven-dependency-plugin.vespa.version> + <maven-dependency-plugin.vespa.version>3.6.1</maven-dependency-plugin.vespa.version> <maven-deploy-plugin.vespa.version>3.1.1</maven-deploy-plugin.vespa.version> <maven-enforcer-plugin.vespa.version>3.4.1</maven-enforcer-plugin.vespa.version> - <maven-failsafe-plugin.vespa.version>3.1.2</maven-failsafe-plugin.vespa.version> + <maven-failsafe-plugin.vespa.version>3.2.1</maven-failsafe-plugin.vespa.version> <maven-gpg-plugin.vespa.version>3.1.0</maven-gpg-plugin.vespa.version> <maven-install-plugin.vespa.version>3.1.1</maven-install-plugin.vespa.version> <maven-jar-plugin.vespa.version>3.3.0</maven-jar-plugin.vespa.version> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 729150bcef1..9851659bef0 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -192,7 +192,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.vespa.version}</version> + <version>${surefire.vespa.tenant.version}</version> <configuration> <groups>${test.categories}</groups> <redirectTestOutputToFile>false</redirectTestOutputToFile> @@ -215,7 +215,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>${surefire.vespa.version}</version> + <version>${surefire.vespa.tenant.version}</version> <configuration> <reportsDirectory>${env.TEST_DIR}</reportsDirectory> </configuration> |