[XEN-3146] use version variable and class-level getter annotation

Author: NotAPenguin0

gradle.properties

@@ -5,7 +5,7 @@ junitJupiterVersion=5.4.2
 mockitoVersion=2.27.0
 solrVersion=6.6.5
 assVersion=2.0.8.2
-amazonVersion=1.12.782
+amazonVersion=2.35.7
 jaxBVersion=4.0.5
 restAssuredVersion=5.5.1
 awaitablityVersion=4.3.0

integration-tests/build.gradle

@@ -28,15 +28,15 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}"
     testImplementation "org.awaitility:awaitility:${awaitablityVersion}"
 
-    testImplementation platform("software.amazon.awssdk:bom:2.35.7")
+    testImplementation platform("software.amazon.awssdk:bom:${amazonVersion}")
 
     testImplementation('software.amazon.awssdk:aws-core')
     testImplementation('software.amazon.awssdk:s3')
     testImplementation("software.amazon.awssdk:sts")
 
-    testImplementation "software.amazon.awssdk:apache-client:2.35.7"
+    testImplementation "software.amazon.awssdk:apache-client:${amazonVersion}"
 
-    testImplementation "software.amazon.awssdk:netty-nio-client:2.35.7"
+    testImplementation "software.amazon.awssdk:netty-nio-client:${amazonVersion}"
 
     testRuntimeOnly "org.glassfish.jaxb:jaxb-runtime:${jaxBVersion}"
 }

solr-backup/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     }
     compileOnly "org.alfresco:alfresco-search:${assVersion}"
 
-    implementation platform("software.amazon.awssdk:bom:2.35.7")
+    implementation platform("software.amazon.awssdk:bom:${amazonVersion}")
 
     implementation('ch.qos.logback:logback-classic:1.4.14')
     compileOnly 'org.projectlombok:lombok:1.18.32'
@@ -29,8 +29,8 @@ dependencies {
     implementation('software.amazon.awssdk:aws-core')
     implementation('software.amazon.awssdk:s3')
     implementation("software.amazon.awssdk:sts")
-    implementation "software.amazon.awssdk:apache-client:2.35.7"
-    implementation "software.amazon.awssdk:netty-nio-client:2.35.7"
+    implementation "software.amazon.awssdk:apache-client:${amazonVersion}"
+    implementation "software.amazon.awssdk:netty-nio-client:${amazonVersion}"
     testImplementation("org.apache.solr:solr-core:${solrVersion}") {
         exclude group: 'org.restlet.jee' // Only available in JCenter, not essential in this project.
     }

solr-backup/src/main/java/eu/xenit/solr/backup/s3/S3BackupRepositoryConfig.java

@@ -26,6 +26,7 @@
  * config can be overridden via environment variables (use uppercase, with '_' instead of '.'), see
  * {@link S3BackupRepositoryConfig#toEnvVar}.
  */
+@Getter
 public class S3BackupRepositoryConfig {
     public static final String S3_BUCKET_NAME = "s3.bucket.name";
     public static final String S3_REGION = "s3.region";
@@ -37,23 +38,22 @@ public class S3BackupRepositoryConfig {
     public static final String S3_PROXY_HOST = "s3.proxy.host";
     public static final String S3_PROXY_PORT = "s3.proxy.port";
 
-    @Getter
     private final String bucketName;
-    @Getter
+
     private final String region;
-    @Getter
+
     private final String accessKey;
-    @Getter
+
     private final String secretKey;
-    @Getter
+
     private final String proxyHost;
-    @Getter
+
     private final int proxyPort;
-    @Getter
+
     private final String endpoint;
-    @Getter
+
     private final Boolean pathStyleAccessEnabled;
-    @Getter
+
     private final Boolean checksumValidationEnabled;