resolved conflicts

10 jobs for ibm_int_quick_fix in 15 minutes and 2 seconds (queued for 1 second)
Status Name Job ID Coverage
  Build
passed compile-and-unit-test #76699
osdu-medium

00:03:33

 
  Containerize
passed osdu-gcp-containerize #76700

00:01:32

 
  Scan
passed fossa-analyze #76701
osdu-medium

00:05:35

passed gemnasium-maven-dependency_scanning #76702
osdu-large

00:01:12

passed license_scanning #76704
osdu-medium

00:02:19

passed spotbugs-sast #76703
osdu-large

00:09:18

 
  Deploy
passed osdu-gcp-deploy #76705

00:00:50

 
  Integration
failed osdu-gcp-test #76706
allowed to fail

00:00:31

 
  Attribution
passed fossa-check-notice #76707
osdu-small

00:02:06

passed fossa-report #76708
osdu-small

00:02:00

 
Name Stage Failure
failed
osdu-gcp-test Integration
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :notification-test-gcp
ERROR: Job failed: exit code 1