From 6ed21e2770b28b995afa65cb07bb4695851e3faf Mon Sep 17 00:00:00 2001 From: Pierre Charton Date: Fri, 13 Dec 2024 09:38:45 +0100 Subject: [PATCH 1/4] Fix Version Pom --- plugins/backup/backroll/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/backup/backroll/pom.xml b/plugins/backup/backroll/pom.xml index 5f7718c129f..f7bad47f920 100644 --- a/plugins/backup/backroll/pom.xml +++ b/plugins/backup/backroll/pom.xml @@ -23,7 +23,7 @@ cloudstack-plugins org.apache.cloudstack - 4.20.0.0-SNAPSHOT + 4.21.0.0-SNAPSHOT ../../pom.xml From 112ea11d61356c998167fbc9f3637b55217f31e4 Mon Sep 17 00:00:00 2001 From: Pierre Charton Date: Fri, 13 Dec 2024 10:35:48 +0100 Subject: [PATCH 2/4] Fix lint errors and log --- .../org/apache/cloudstack/backup/BackrollBackupProvider.java | 2 +- .../org/apache/cloudstack/backup/backroll/BackrollClient.java | 2 +- .../model/response/archive/BackrollBackupsFromVMResponse.java | 2 +- .../backroll/model/response/backup/BackrollBackupResponse.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java index 8feafe22c4f..57826c711fa 100644 --- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java +++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java @@ -107,7 +107,7 @@ public class BackrollBackupProvider extends AdapterBase implements BackupProvide return results; } } catch (ParseException | BackrollApiException | IOException e) { - logger.info("BackrollProvider: catch erreur: " + e); + logger.info("BackrollProvider: catch erreur: {}", e); throw new CloudRuntimeException("Failed to load backup offerings"); } return new ArrayList(); diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java index a5978b81541..e8af20029d4 100644 --- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java +++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java @@ -225,4 +225,4 @@ public class BackrollClient { return backups; } -} \ No newline at end of file +} diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java index 0fa3398bda8..687ca86bfbb 100644 --- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java +++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java @@ -7,4 +7,4 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class BackrollBackupsFromVMResponse extends BackrollAsyncResponse { @JsonProperty("info") public BackrollArchivesResponse archives; -} \ No newline at end of file +} diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/backup/BackrollBackupResponse.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/backup/BackrollBackupResponse.java index a8eb0b14f58..f4ce131eb8c 100644 --- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/backup/BackrollBackupResponse.java +++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/backup/BackrollBackupResponse.java @@ -20,4 +20,4 @@ import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncRespons public class BackrollBackupResponse extends BackrollAsyncResponse{ -} \ No newline at end of file +} From fe180a1bb6c9fb7cdb2e99f6b3a5377ae2173572 Mon Sep 17 00:00:00 2001 From: Pierre Charton Date: Fri, 13 Dec 2024 10:44:05 +0100 Subject: [PATCH 3/4] fix license --- .../archive/BackrollBackupsFromVMResponse.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java index 687ca86bfbb..bde2f3645db 100644 --- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java +++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java @@ -1,3 +1,19 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package org.apache.cloudstack.backup.backroll.model.response.archive; import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse; From a1b3d75ea14d750dc284caaaa278b0b23be0a3df Mon Sep 17 00:00:00 2001 From: Pierre Charton Date: Fri, 13 Dec 2024 10:52:53 +0100 Subject: [PATCH 4/4] fix license --- .../bootstrap/default-config-resources.xml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml b/core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml index ae266d1e0a2..d2895050b9e 100644 --- a/core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml +++ b/core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml @@ -1,3 +1,23 @@ +