From 682ecc305324cd3756005d0c8991e7019d1cb382 Mon Sep 17 00:00:00 2001
From: Anurag Mittal <anurag.mittal@scality.com>
Date: Thu, 18 Jul 2024 08:48:22 +0200
Subject: [PATCH 1/2] OSIS-151: removed utapi healthcheck and bump to 2.2.5

---
 build.gradle                                  |  2 +-
 .../healthcheck/UtapiHealthIndicator.java     | 22 -------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 osis-app/src/main/java/com/scality/osis/healthcheck/UtapiHealthIndicator.java

diff --git a/build.gradle b/build.gradle
index 019d43a..8795ed1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        osisVersion = '2.2.4'
+        osisVersion = '2.2.5'
         vaultclientVersion = '1.1.2'
         springBootVersion = '2.7.6'
     }
diff --git a/osis-app/src/main/java/com/scality/osis/healthcheck/UtapiHealthIndicator.java b/osis-app/src/main/java/com/scality/osis/healthcheck/UtapiHealthIndicator.java
deleted file mode 100644
index 4fb76be..0000000
--- a/osis-app/src/main/java/com/scality/osis/healthcheck/UtapiHealthIndicator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- *Copyright 2021 Scality, Inc.
- *SPDX-License-Identifier: Apache License 2.0
- */
-
-package com.scality.osis.healthcheck;
-
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.stereotype.Component;
-
-
-@Component("utapi")
-public class UtapiHealthIndicator implements HealthIndicator {
-
-    @Override
-    public Health health() {
-        // We want to make sure healthcheck is false even if it is set in application.properties
-        // This will be enabled and potentially refactored with S3C-8266
-        return Health.down().build();
-    }
-}

From ea0ab90f5a83b7b61deb7224a0ac9e86dfbbdd7e Mon Sep 17 00:00:00 2001
From: Anurag Mittal <anurag.mittal@scality.com>
Date: Fri, 19 Jul 2024 10:47:27 +0200
Subject: [PATCH 2/2] OSIS-152: remove gradle build step for OSIS

We are removing this as OSIS is not being used as
a dependency for any repository and its a
microservice in itself.
---
 .github/workflows/gradle-build-and-upload.yml | 2 +-
 .github/workflows/release.yml                 | 7 -------
 .github/workflows/test-and-build.yml          | 5 -----
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/gradle-build-and-upload.yml b/.github/workflows/gradle-build-and-upload.yml
index 154eebb..60c29cf 100644
--- a/.github/workflows/gradle-build-and-upload.yml
+++ b/.github/workflows/gradle-build-and-upload.yml
@@ -46,4 +46,4 @@ jobs:
 
       - name: Gradle Upload Archives to Releases Repository
         if: ${{ inputs.release }}
-        run: ./gradlew publishSonatypePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository -Prelease -PsonatypeUsername=$NEXUS_UNAME -PsonatypePassword=$NEXUS_PWD -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/secring.gpg -Psigning.keyId=$SIGNING_KEYID -Psigning.password=$SIGNING_PWD
+        run: ./gradlew publishSonatypePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository -Prelease -PsonatypeUsername=$NEXUS_UNAME -PsonatypePassword=$NEXUS_PWD -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/secring.gpg -Psigning.keyId=$SIGNING_KEYID -Psigning.password=$SIGNING_PWD
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6801e7c..21740a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,10 +31,3 @@ jobs:
           tag_name: ${{ github.event.inputs.tag }}
           generate_release_notes: true
           target_commitish: ${{ github.sha }}
-
-  gradle-release:
-    name: Gradle build and upload release
-    uses: ./.github/workflows/gradle-build-and-upload.yml
-    secrets: inherit
-    with:
-      release: true
diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index 9938c83..805b3df 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -8,11 +8,6 @@ on:
       - q/*/**
 
 jobs:
-  gradle_build_and_upload:
-    name: Gradle build and upload snapshot
-    uses: ./.github/workflows/gradle-build-and-upload.yml
-    secrets: inherit
-
   docker-build:
     name: Development docker image
     uses: ./.github/workflows/docker-build.yml