From 1ab81f8f28959a3c17feaacbb2e27488a940c3f9 Mon Sep 17 00:00:00 2001 From: Stefan Yonkov Date: Thu, 13 Nov 2025 12:00:20 +0200 Subject: [PATCH 1/7] update dependencies --- multiapps-controller-api/pom.xml | 14 +-- .../src/main/java/module-info.java | 3 +- multiapps-controller-client/pom.xml | 4 +- multiapps-controller-core/pom.xml | 2 +- multiapps-controller-process/pom.xml | 2 +- multiapps-controller-web/pom.xml | 2 +- pom.xml | 86 ++++++++----------- 7 files changed, 49 insertions(+), 64 deletions(-) diff --git a/multiapps-controller-api/pom.xml b/multiapps-controller-api/pom.xml index e441739fbd..25607e87a5 100644 --- a/multiapps-controller-api/pom.xml +++ b/multiapps-controller-api/pom.xml @@ -14,10 +14,6 @@ - - jakarta.xml.bind - jakarta.xml.bind-api - org.glassfish.jaxb jaxb-core @@ -27,7 +23,7 @@ jaxb-runtime - com.fasterxml.jackson.core + tools.jackson.core jackson-databind @@ -39,7 +35,7 @@ jakarta.inject-api - io.swagger + io.swagger.core.v3 swagger-annotations @@ -72,6 +68,12 @@ jaxb-api provided + + io.swagger + swagger-annotations + 1.6.16 + compile + diff --git a/multiapps-controller-api/src/main/java/module-info.java b/multiapps-controller-api/src/main/java/module-info.java index 68c2b7388e..6695a104e1 100644 --- a/multiapps-controller-api/src/main/java/module-info.java +++ b/multiapps-controller-api/src/main/java/module-info.java @@ -14,8 +14,9 @@ requires static java.compiler; requires static jakarta.inject; requires static org.immutables.value; - requires static io.swagger.annotations; + requires static io.swagger.v3.oas.annotations; requires jakarta.servlet; requires jakarta.xml.bind; + requires io.swagger.annotations; } \ No newline at end of file diff --git a/multiapps-controller-client/pom.xml b/multiapps-controller-client/pom.xml index eba015cffd..1ae71e1513 100644 --- a/multiapps-controller-client/pom.xml +++ b/multiapps-controller-client/pom.xml @@ -66,12 +66,12 @@ - com.fasterxml.jackson.core + tools.jackson.core jackson-core - com.fasterxml.jackson.core + tools.jackson.core jackson-databind diff --git a/multiapps-controller-core/pom.xml b/multiapps-controller-core/pom.xml index 9ec1e2ff41..51ad2598d9 100644 --- a/multiapps-controller-core/pom.xml +++ b/multiapps-controller-core/pom.xml @@ -36,7 +36,7 @@ jakarta.servlet-api - com.fasterxml.jackson.core + tools.jackson.core jackson-databind diff --git a/multiapps-controller-process/pom.xml b/multiapps-controller-process/pom.xml index 1f4f1fde82..ffd4d4873f 100644 --- a/multiapps-controller-process/pom.xml +++ b/multiapps-controller-process/pom.xml @@ -52,7 +52,7 @@ jakarta.servlet-api - com.fasterxml.jackson.core + tools.jackson.core jackson-databind diff --git a/multiapps-controller-web/pom.xml b/multiapps-controller-web/pom.xml index 55eea4f790..038f235d83 100644 --- a/multiapps-controller-web/pom.xml +++ b/multiapps-controller-web/pom.xml @@ -99,7 +99,7 @@ jaxb-runtime - com.fasterxml.jackson.core + tools.jackson.core jackson-databind diff --git a/pom.xml b/pom.xml index 753184cf07..1c4eb2a2dd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,48 +15,47 @@ cloudfoundry ../multiapps-controller-coverage/target/site/jacoco-aggregate/jacoco.xml - 5.13.4 - 1.13.2 - 5.18.0 - 2.2.224 + 6.0.1 + 5.20.0 + 2.4.240 6.1.0 - 2.25.1 + 2.25.2 2.0.17 - 2.20.0 + 2.21.0 4.5.0 - 2.4 - 5.5 - 5.3.4 - 4.0.7 + 2.5 + 5.5.1 + 5.3.6 + 4.0.8 7.2.0 - 6.2.11 - 6.5.4 - 6.3.0 - 2.19.2 - 4.33.0 + 6.2.12 + 6.5.6 + 7.0.2 + 2.20 + 3.0.2 + 5.0.1 5.1.0 5.14.0.RELEASE - 1.2.10 + 1.2.12 1.6.16 2.7.0 - 33.4.8-jre + 33.5.0-jre 2.3.0 - 2.10.1 - 1.15.3 + 2.11.6 + 1.16.0 3.18.3 1.1.1 - 1.18.0 + 1.20.0 2.41.0 3.5.0 - 4.0.2 - 4.0.5 - 4.0.5 + 4.0.4 + 4.0.6 2.0.1 3.0.0 - 2.1.9 + 2.1.10 1.28.0 - 3.2.2 - 1.3.1 + 3.2.3 + 1.3.5 2.59.0 0.128.7 @@ -326,7 +325,7 @@ org.junit.platform junit-platform-launcher - ${junit-platform.version} + ${junit.version} test @@ -368,12 +367,6 @@ jaxb-core ${jaxb-core.version} - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb-impl.version} - @@ -388,11 +381,11 @@ micrometer-registry-jmx ${micrometer.version} - + - io.swagger + io.swagger.core.v3 swagger-annotations - ${swagger.version} + 2.2.40 @@ -690,17 +683,17 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} + ${jackson-annotations.version} - + - com.fasterxml.jackson.core + tools.jackson.core jackson-core ${jackson.version} - + - com.fasterxml.jackson.core + tools.jackson.core jackson-databind ${jackson.version} @@ -886,17 +879,6 @@ - - - - - central-sonatype From 6e088b6e219df79efca344aadbf590e23f0e5914 Mon Sep 17 00:00:00 2001 From: Stefan Yonkov Date: Fri, 14 Nov 2025 16:19:24 +0200 Subject: [PATCH 2/7] fix comments, revert migration to swagger --- multiapps-controller-api/pom.xml | 8 +------- .../src/main/java/module-info.java | 1 - pom.xml | 10 +++++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/multiapps-controller-api/pom.xml b/multiapps-controller-api/pom.xml index 25607e87a5..113ccad9e3 100644 --- a/multiapps-controller-api/pom.xml +++ b/multiapps-controller-api/pom.xml @@ -35,7 +35,7 @@ jakarta.inject-api - io.swagger.core.v3 + io.swagger swagger-annotations @@ -68,12 +68,6 @@ jaxb-api provided - - io.swagger - swagger-annotations - 1.6.16 - compile - diff --git a/multiapps-controller-api/src/main/java/module-info.java b/multiapps-controller-api/src/main/java/module-info.java index 6695a104e1..b5b9d1f0d6 100644 --- a/multiapps-controller-api/src/main/java/module-info.java +++ b/multiapps-controller-api/src/main/java/module-info.java @@ -14,7 +14,6 @@ requires static java.compiler; requires static jakarta.inject; requires static org.immutables.value; - requires static io.swagger.v3.oas.annotations; requires jakarta.servlet; requires jakarta.xml.bind; requires io.swagger.annotations; diff --git a/pom.xml b/pom.xml index 1c4eb2a2dd..c4bdd3d679 100644 --- a/pom.xml +++ b/pom.xml @@ -28,12 +28,12 @@ 5.3.6 4.0.8 7.2.0 - 6.2.12 + 6.2.13 6.5.6 7.0.2 2.20 3.0.2 - 5.0.1 + 4.33.0 5.1.0 5.14.0.RELEASE 1.2.12 @@ -381,11 +381,11 @@ micrometer-registry-jmx ${micrometer.version} - + - io.swagger.core.v3 + io.swagger swagger-annotations - 2.2.40 + ${swagger.version} From 8bcd7dd69d5d63cb8ab81db32cafa5f13ea1a9c8 Mon Sep 17 00:00:00 2001 From: Stefan Yonkov Date: Fri, 14 Nov 2025 16:23:57 +0200 Subject: [PATCH 3/7] revert changes to module-info.java --- multiapps-controller-api/src/main/java/module-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multiapps-controller-api/src/main/java/module-info.java b/multiapps-controller-api/src/main/java/module-info.java index b5b9d1f0d6..68c2b7388e 100644 --- a/multiapps-controller-api/src/main/java/module-info.java +++ b/multiapps-controller-api/src/main/java/module-info.java @@ -14,8 +14,8 @@ requires static java.compiler; requires static jakarta.inject; requires static org.immutables.value; + requires static io.swagger.annotations; requires jakarta.servlet; requires jakarta.xml.bind; - requires io.swagger.annotations; } \ No newline at end of file From b1085f7bbf98b3b0e22122bda27e0f040cec81b8 Mon Sep 17 00:00:00 2001 From: Stefan Yonkov Date: Tue, 25 Nov 2025 13:21:28 +0200 Subject: [PATCH 4/7] fix annotations --- .../controller/web/configuration/DatabaseConfiguration.java | 1 - .../controller/web/configuration/FileStorageConfiguration.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java index 115f569e55..eb0beeb4df 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java @@ -53,7 +53,6 @@ public DataSourceTransactionManager transactionManager(DataSource dataSource, Ap return dataSourceTransactionManager; } - @Inject @Bean @Primary public LocalContainerEntityManagerFactoryBean defaultEntityManagerFactory(DataSource dataSource, diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java index 8994c622cf..00d84b1e45 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java @@ -1,6 +1,5 @@ package org.cloudfoundry.multiapps.controller.web.configuration; -import jakarta.inject.Inject; import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration; import org.cloudfoundry.multiapps.controller.persistence.util.EnvironmentServicesFinder; import org.cloudfoundry.multiapps.controller.web.configuration.bean.factory.ObjectStoreFileStorageFactoryBean; @@ -14,7 +13,6 @@ public class FileStorageConfiguration { private static final String OBJECT_STORE_SERVICE_NAME = "deploy-service-os"; - @Inject @Bean public ObjectStoreFileStorageFactoryBean objectStoreFileStorage(EnvironmentServicesFinder vcapServiceFinder, ApplicationConfiguration applicationConfiguration) { From 0e075399a739c76acdb049e369c7474bc1cc83d1 Mon Sep 17 00:00:00 2001 From: Stefan Yonkov Date: Thu, 27 Nov 2025 11:41:59 +0200 Subject: [PATCH 5/7] update more dependencies from renovate bot --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c4bdd3d679..4f484221c5 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.7.0 33.5.0-jre 2.3.0 - 2.11.6 + 2.11.7 1.16.0 3.18.3 1.1.1 @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.2 + 3.12.0 From 7689c6f96d7268429dfaafb2b1c2d7edad9ac098 Mon Sep 17 00:00:00 2001 From: Stefan Yonkov Date: Thu, 27 Nov 2025 16:05:05 +0200 Subject: [PATCH 6/7] update to latest spring --- .../src/main/resources/mtarest.yaml | 181 ------------------ pom.xml | 4 +- 2 files changed, 2 insertions(+), 183 deletions(-) diff --git a/multiapps-controller-api/src/main/resources/mtarest.yaml b/multiapps-controller-api/src/main/resources/mtarest.yaml index 2fa76ac907..bbc4cb40ec 100644 --- a/multiapps-controller-api/src/main/resources/mtarest.yaml +++ b/multiapps-controller-api/src/main/resources/mtarest.yaml @@ -37,127 +37,6 @@ paths: $ref: "#/definitions/Info" security: - oauth2: [] - /api/v1/spaces/{spaceGuid}/files: - get: - summary: "" - description: "Retrieves all Multi-Target Application files " - operationId: "getMtaFiles" - produces: - - "application/json" - parameters: - - name: "spaceGuid" - in: "path" - description: "GUID of space with mtas" - required: true - type: "string" - - name: "namespace" - in: "query" - description: "Filter mtas by namespace" - required: false - type: "string" - responses: - 200: - description: "OK" - schema: - type: "array" - items: - $ref: "#/definitions/FileMetadata" - security: - - oauth2: [] - post: - summary: "" - description: "Uploads a Multi Target Application archive or an Extension Descriptor " - operationId: "uploadMtaFile" - consumes: - - "multipart/form-data" - produces: - - "application/json" - parameters: - - name: "spaceGuid" - in: "path" - description: "GUID of space you wish to deploy in" - required: true - type: "string" - - name: "namespace" - in: "query" - description: "file namespace" - required: false - type: "string" - responses: - 200: - description: "successful operation" - schema: - $ref: "#/definitions/FileMetadata" - 201: - description: "Created" - schema: - $ref: "#/definitions/FileMetadata" - security: - - oauth2: [] - /api/v1/spaces/{spaceGuid}/files/async: - post: - summary: "" - description: "Uploads a Multi Target Application archive or an Extension Descriptor\ - \ from a remote endpoint" - operationId: "startUploadFromUrl" - consumes: - - "application/json" - parameters: - - name: "spaceGuid" - in: "path" - description: "GUID of space you wish to deploy in" - required: true - type: "string" - - name: "namespace" - in: "query" - description: "file namespace" - required: false - type: "string" - - in: "body" - name: "body" - description: "URL reference to a remote file" - required: false - schema: - $ref: "#/definitions/FileUrl" - responses: - 202: - description: "Accepted" - security: - - oauth2: [] - /api/v1/spaces/{spaceGuid}/files/jobs/{jobId}: - get: - summary: "" - description: "Gets the status of an async upload job" - operationId: "getAsyncUploadJob" - produces: - - "application/json" - parameters: - - name: "spaceGuid" - in: "path" - description: "GUID of space you wish to deploy in" - required: true - type: "string" - - name: "namespace" - in: "query" - description: "file namespace" - required: false - type: "string" - - name: "jobId" - in: "path" - description: "ID of the upload job" - required: true - type: "string" - responses: - 200: - description: "OK" - schema: - $ref: "#/definitions/AsyncUploadResult" - 201: - description: "Created" - schema: - $ref: "#/definitions/AsyncUploadResult" - security: - - oauth2: [] /api/v1/spaces/{spaceGuid}/mtas: get: summary: "" @@ -403,66 +282,6 @@ securityDefinitions: flow: "password" scopes: {} definitions: - AsyncUploadResult: - type: "object" - properties: - status: - type: "string" - readOnly: true - enum: - - "RUNNING" - - "FINISHED" - - "ERROR" - bytes_processed: - type: "integer" - format: "int64" - readOnly: true - error: - type: "string" - readOnly: true - file: - readOnly: true - $ref: "#/definitions/FileMetadata" - mta_id: - type: "string" - readOnly: true - client_actions: - type: "array" - readOnly: true - items: - type: "string" - enum: - - "RETRY_UPLOAD" - FileMetadata: - type: "object" - properties: - id: - type: "string" - readOnly: true - name: - type: "string" - readOnly: true - size: - type: "integer" - readOnly: true - digest: - type: "string" - readOnly: true - digestAlgorithm: - type: "string" - readOnly: true - space: - type: "string" - readOnly: true - namespace: - type: "string" - readOnly: true - FileUrl: - type: "object" - properties: - file_url: - type: "string" - readOnly: true Info: type: "object" properties: diff --git a/pom.xml b/pom.xml index 4f484221c5..71c1c08e2c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,8 +28,8 @@ 5.3.6 4.0.8 7.2.0 - 6.2.13 - 6.5.6 + 6.2.14 + 6.5.7 7.0.2 2.20 3.0.2 From 545100ae765bd3a3646f36b487e98720954cfd5d Mon Sep 17 00:00:00 2001 From: Stefan Yonkov Date: Thu, 27 Nov 2025 16:15:23 +0200 Subject: [PATCH 7/7] revert mtarest.yaml --- .../src/main/resources/mtarest.yaml | 181 ++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/multiapps-controller-api/src/main/resources/mtarest.yaml b/multiapps-controller-api/src/main/resources/mtarest.yaml index bbc4cb40ec..2fa76ac907 100644 --- a/multiapps-controller-api/src/main/resources/mtarest.yaml +++ b/multiapps-controller-api/src/main/resources/mtarest.yaml @@ -37,6 +37,127 @@ paths: $ref: "#/definitions/Info" security: - oauth2: [] + /api/v1/spaces/{spaceGuid}/files: + get: + summary: "" + description: "Retrieves all Multi-Target Application files " + operationId: "getMtaFiles" + produces: + - "application/json" + parameters: + - name: "spaceGuid" + in: "path" + description: "GUID of space with mtas" + required: true + type: "string" + - name: "namespace" + in: "query" + description: "Filter mtas by namespace" + required: false + type: "string" + responses: + 200: + description: "OK" + schema: + type: "array" + items: + $ref: "#/definitions/FileMetadata" + security: + - oauth2: [] + post: + summary: "" + description: "Uploads a Multi Target Application archive or an Extension Descriptor " + operationId: "uploadMtaFile" + consumes: + - "multipart/form-data" + produces: + - "application/json" + parameters: + - name: "spaceGuid" + in: "path" + description: "GUID of space you wish to deploy in" + required: true + type: "string" + - name: "namespace" + in: "query" + description: "file namespace" + required: false + type: "string" + responses: + 200: + description: "successful operation" + schema: + $ref: "#/definitions/FileMetadata" + 201: + description: "Created" + schema: + $ref: "#/definitions/FileMetadata" + security: + - oauth2: [] + /api/v1/spaces/{spaceGuid}/files/async: + post: + summary: "" + description: "Uploads a Multi Target Application archive or an Extension Descriptor\ + \ from a remote endpoint" + operationId: "startUploadFromUrl" + consumes: + - "application/json" + parameters: + - name: "spaceGuid" + in: "path" + description: "GUID of space you wish to deploy in" + required: true + type: "string" + - name: "namespace" + in: "query" + description: "file namespace" + required: false + type: "string" + - in: "body" + name: "body" + description: "URL reference to a remote file" + required: false + schema: + $ref: "#/definitions/FileUrl" + responses: + 202: + description: "Accepted" + security: + - oauth2: [] + /api/v1/spaces/{spaceGuid}/files/jobs/{jobId}: + get: + summary: "" + description: "Gets the status of an async upload job" + operationId: "getAsyncUploadJob" + produces: + - "application/json" + parameters: + - name: "spaceGuid" + in: "path" + description: "GUID of space you wish to deploy in" + required: true + type: "string" + - name: "namespace" + in: "query" + description: "file namespace" + required: false + type: "string" + - name: "jobId" + in: "path" + description: "ID of the upload job" + required: true + type: "string" + responses: + 200: + description: "OK" + schema: + $ref: "#/definitions/AsyncUploadResult" + 201: + description: "Created" + schema: + $ref: "#/definitions/AsyncUploadResult" + security: + - oauth2: [] /api/v1/spaces/{spaceGuid}/mtas: get: summary: "" @@ -282,6 +403,66 @@ securityDefinitions: flow: "password" scopes: {} definitions: + AsyncUploadResult: + type: "object" + properties: + status: + type: "string" + readOnly: true + enum: + - "RUNNING" + - "FINISHED" + - "ERROR" + bytes_processed: + type: "integer" + format: "int64" + readOnly: true + error: + type: "string" + readOnly: true + file: + readOnly: true + $ref: "#/definitions/FileMetadata" + mta_id: + type: "string" + readOnly: true + client_actions: + type: "array" + readOnly: true + items: + type: "string" + enum: + - "RETRY_UPLOAD" + FileMetadata: + type: "object" + properties: + id: + type: "string" + readOnly: true + name: + type: "string" + readOnly: true + size: + type: "integer" + readOnly: true + digest: + type: "string" + readOnly: true + digestAlgorithm: + type: "string" + readOnly: true + space: + type: "string" + readOnly: true + namespace: + type: "string" + readOnly: true + FileUrl: + type: "object" + properties: + file_url: + type: "string" + readOnly: true Info: type: "object" properties: