Merge pull request #244 from thecodeteam/bugfix-test-failures

Bugfix test failures

Author: twincitiesguy

build.gradle

@@ -1,14 +1,14 @@
 buildscript {
     ext {
-        springBootVersion = '2.7.2'
+        springBootVersion = '2.7.9' // 3.x requires Java 17
     }
     repositories {
         mavenCentral()
         maven { url 'https://repo.spring.io/plugins-release' }
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-        classpath('io.spring.gradle:dependency-management-plugin:1.0.12.RELEASE')
+        classpath('io.spring.gradle:dependency-management-plugin:1.1.0')
     }
 }
 
@@ -28,7 +28,7 @@ repositories {
 }
 
 ext {
-    springCloudServiceBrokerVersion = '3.5.2'
+    springCloudServiceBrokerVersion = '3.6.0'
 }
 
 dependencies {
@@ -37,24 +37,21 @@ dependencies {
     implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: springBootVersion)
     implementation(group: 'org.springframework.boot', name: 'spring-boot-devtools', version: springBootVersion)
     implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion)
-    implementation(group: 'org.springframework.cloud', name: 'spring-cloud-starter-open-service-broker', version: springCloudServiceBrokerVersion)
-    implementation(group: 'org.glassfish.jersey.media', name: 'jersey-media-jaxb', version: '2.36')
+    implementation(group: 'org.springframework.cloud', name: 'spring-cloud-starter-open-service-broker', version: springCloudServiceBrokerVersion) {
+        exclude module: "log4j-slf4j-impl"
+    }
+    implementation(group: 'org.glassfish.jersey.media', name: 'jersey-media-jaxb', version: '2.39')
     implementation(group: 'com.google.guava', name: 'guava', version: '31.1-jre')
-    implementation(group: 'ch.qos.logback', name: 'logback-core', version: '1.2.9')
-    implementation(group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.9')
-    implementation(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.2')
-    implementation(group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.17.2')
+    implementation(group: 'org.slf4j', name: 'slf4j-api', version: '2.0.6')
+    implementation(group: 'ch.qos.logback', name: 'logback-core', version: '1.4.6')
+    implementation(group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.6')
+    implementation(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0')
+    implementation(group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.20.0')
     implementation(group: 'com.sun.jersey.contribs', name: 'jersey-apache-client4', version: '1.19.4')
 
-    implementation(group: 'com.emc.ecs', name: 'object-client', version: '3.4.2') {
-        exclude module: "slf4j-log4j12"
-        exclude module: "jsr311-api"
-    }
-
-    implementation(group: 'com.emc.ecs', name: 'bucket-wipe', version: '2.0.1') {
-        exclude module: "log4j"
-        exclude module: "slf4j-log4j12"
-        exclude module: "jsr311-api"
+    implementation(group: 'com.emc.ecs', name: 'object-client', version: '3.4.5')
+    implementation(group: 'com.emc.ecs', name: 'bucket-wipe', version: '2.2.0') {
+        exclude module: "log4j-slf4j-impl"
     }
 
     testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion)
@@ -63,11 +60,11 @@ dependencies {
     testImplementation(group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.9')
     testImplementation(group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.9')
     testImplementation(group: 'com.github.tomakehurst', name: 'wiremock-standalone', version: '2.27.2')
-    testImplementation(group: 'com.github.paulcwarren', name: 'ginkgo4j', version: '1.0.14')
+    testImplementation(group: 'com.github.paulcwarren', name: 'ginkgo4j', version: '1.0.15')
 }
 
 task wrapperOld(type: Wrapper) {
-    gradleVersion = '6.8'
+    gradleVersion = '6.9.4'
 }
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/test/resources/application-test.yml

@@ -1,3 +1,5 @@
+# You can use multiple profiles to easily configure for test and production.
+# Copy this file to `<project root>/src/main/resources/application.yml`.
 ---
 spring:
   config:
@@ -33,6 +35,9 @@ broker:
   replication-group: rg1
   management-endpoint: https://127.0.0.1:4443
   object-endpoint: http://127.0.0.1:9020
+  # TODO: figure out why removing these 2 lines causes wiremock tests to fail
+  repository-service-id: f3cbab6a-5172-4ff1-a5c7-72990f0ce2aa
+  repository-plan-id: 89d20694-9ab0-4a98-bc6a-868d6d4ecf31
   ignore-ssl-validation: false
 catalog:
   services: