diff --git a/apps/openchallenges/api-gateway/project.json b/apps/openchallenges/api-gateway/project.json index bf4bd3f5f2..4efd0fe3fe 100644 --- a/apps/openchallenges/api-gateway/project.json +++ b/apps/openchallenges/api-gateway/project.json @@ -19,23 +19,28 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/api-gateway" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/api-gateway" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/api-gateway" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "serve": { @@ -55,9 +60,10 @@ "dependsOn": [] }, "build-image-base": { - "executor": "@nxrocks/nx-spring-boot:build-image", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/api-gateway" + "command": "./gradlew bootBuildImage", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, diff --git a/apps/openchallenges/auth-service/project.json b/apps/openchallenges/auth-service/project.json index 6b2f315d4b..cd07ad75d0 100644 --- a/apps/openchallenges/auth-service/project.json +++ b/apps/openchallenges/auth-service/project.json @@ -19,23 +19,28 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/auth-service" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/auth-service" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/auth-service" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "serve": { @@ -54,14 +59,14 @@ "cwd": "apps/openchallenges/auth-service" }, "dependsOn": [] - }, - "build-image": { - "executor": "@nxrocks/nx-spring-boot:build-image", - "options": { - "root": "apps/openchallenges/auth-service" - }, - "dependsOn": ["^install"] } + // "build-image": { + // "executor": "@nxrocks/nx-spring-boot:build-image", + // "options": { + // "root": "apps/openchallenges/auth-service" + // }, + // "dependsOn": ["^install"] + // } }, "tags": ["type:service", "scope:backend", "language:java", "package-manager:gradle"], "implicitDependencies": [ diff --git a/apps/openchallenges/challenge-service/project.json b/apps/openchallenges/challenge-service/project.json index d4d375c32f..cba3e35146 100644 --- a/apps/openchallenges/challenge-service/project.json +++ b/apps/openchallenges/challenge-service/project.json @@ -19,17 +19,20 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "{projectRoot}" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "{projectRoot}" + "command": "./gradlew test", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, @@ -42,21 +45,24 @@ "dependsOn": ["test"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "{projectRoot}" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "{projectRoot}" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "{projectRoot}" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } }, "serve": { @@ -76,9 +82,10 @@ "dependsOn": [] }, "build-image-base": { - "executor": "@nxrocks/nx-spring-boot:build-image", + "executor": "nx:run-commands", "options": { - "root": "{projectRoot}" + "command": "./gradlew bootBuildImage", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, @@ -130,7 +137,7 @@ "tags": ["type:service", "scope:backend", "language:java", "package-manager:gradle"], "implicitDependencies": [ "openchallenges-api-description", - "openchallenges-app-config-data", + "openchallenges-app-config-data", "shared-java-util" ] } diff --git a/apps/openchallenges/challenge-service/src/main/resources/db/challenges.csv b/apps/openchallenges/challenge-service/src/main/resources/db/challenges.csv index 9faf6b4c06..6b9c2b6156 100644 --- a/apps/openchallenges/challenge-service/src/main/resources/db/challenges.csv +++ b/apps/openchallenges/challenge-service/src/main/resources/db/challenges.csv @@ -377,7 +377,7 @@ "376","flare","FLARE21","Abdominal organ segmentation challenge","Abdominal organ segmentation plays an important role in clinical practice, and to some extent, it seems to be a solved problem because the state-of-the-art methods have achieved inter-observer performance in several benchmark datasets. However, most of the existing abdominal datasets only contain single-center, single-phase, single-vendor, or single-disease cases, and it is unclear whether the excellent performance can be generalized on more diverse datasets. Moreover, many SOTA methods use model ensembles to boost performance, but these solutions usually have a large model size and cost extensive computational resources, which are impractical to be deployed in clinical practice. To address these limitations, we organize the Fast and Low GPU Memory Abdominal Organ Segmentation challenge that has two main features: (1) the dataset is large and diverse, includes 511 cases from 11 medical centers. (2) we not only focus on segmentation accuracy but also segmentation efficiency, whi...","https://rumc-gcorg-p-public.s3.amazonaws.com/logos/challenge/599/logo_hDqJ8uG.gif","https://flare.grand-challenge.org/","active","5","https://doi.org/10.1016/j.media.2022.102616","\N","\N","\N","2023-11-08 00:42:00","2023-11-15 22:36:39" "377","nucls","NuCLS","Triple-negative breast cancer nuclei challenge","Classification, Localization and Segmentation of nuclei in scanned FFPE H&E stained slides of triple-negative breast cancer from The Cancer Genome Atlas. See: Amgad et al. 2021. arXiv:2102.09099 [cs.CV].","https://rumc-gcorg-p-public.s3.amazonaws.com/logos/challenge/601/TCGA-AR-A0U4-DX1_id-5ea40a88ddda5f8398990ccf_left-42405_top-70784_bo_PgpXdUu.png","https://nucls.grand-challenge.org/","completed","5","","\N","\N","\N","2023-11-08 00:42:00","2023-11-17 23:29:28" "378","bcsegmentation","Breast Cancer Segmentation","Triple-negative breast cancer segmentation","Semantic segmentation of histologic regions in scanned FFPE H&E stained slides of triple-negative breast cancer from The Cancer Genome Atlas. See: Amgad M, Elfandy H, ..., Gutman DA, Cooper LAD. Structured crowdsourcing enables convolutional segmentation of histology images. Bioinformatics. 2019. doi: 10.1093/bioinformatics/btz083","https://rumc-gcorg-p-public.s3.amazonaws.com/logos/challenge/602/BCSegmentationLogo.png","https://bcsegmentation.grand-challenge.org/","completed","5","","\N","\N","\N","2023-11-08 00:42:00","2023-11-17 23:29:37" -"379","feta","FeTA - Fetal Tissue Annotation Challenge","Fetal tissue annotation challenge","The Fetal Tissue Annotation and Segmentation Challenge (FeTA) is a multi-class, multi-institution image segmentation challenge part of MICCAI 2022. The goal of FeTA is to develop generalizable automatic multi-class segmentation methods for the segmentation of developing human brain tissues that will work with data acquired at different hospitals. The challenge provides manually annotated, super-resolution reconstructed MRI data of human fetal brains which will be used for training and testing automated multi-class image segmentation algorithms. In FeTA 2021, we used the first publicly available dataset of fetal brain MRI to encourage teams to develop automatic brain tissue segmentation algorithms. This year, FeTA 2022 takes it to the next level by launching a multi-center challenge for the development of image segmentation algorithms that will be generalizable to different hospitals with unseen data. We will include data from two institutions in the training dataset, and there wi...","https://rumc-gcorg-p-public.s3.amazonaws.com/logos/challenge/604/FeTA_logo_640.png","https://feta.grand-challenge.org/","upcoming","5","","2024-03-21","2024-04-26","\N","2023-11-08 00:42:00","2023-12-12 19:00:18" +"379","feta","FeTA - Fetal Tissue Annotation Challenge","Fetal tissue annotation challenge","The Fetal Tissue Annotation and Segmentation Challenge (FeTA) is a multi-class, multi-institution image segmentation challenge part of MICCAI 2022. The goal of FeTA is to develop generalizable automatic multi-class segmentation methods for the segmentation of developing human brain tissues that will work with data acquired at different hospitals. The challenge provides manually annotated, super-resolution reconstructed MRI data of human fetal brains which will be used for training and testing automated multi-class image segmentation algorithms. In FeTA 2021, we used the first publicly available dataset of fetal brain MRI to encourage teams to develop automatic brain tissue segmentation algorithms. This year, FeTA 2022 takes it to the next level by launching a multi-center challenge for the development of image segmentation algorithms that will be generalizable to different hospitals with unseen data. We will include data from two institutions in the training dataset, and there wi...","https://rumc-gcorg-p-public.s3.amazonaws.com/logos/challenge/604/FeTA_logo_640.png","https://feta.grand-challenge.org/","active","5","","2024-03-21","2024-04-26","\N","2023-11-08 00:42:00","2023-12-12 19:00:18" "380","fastpet-ld","fastPET-LD","PET scan ""hot spots"" detection challenge","In this challenge, we provide 2 training datasets of 68 cases each: the first one was acquired at Sheba medical center (Israel) nuclear medicine department with a very-short exposure of 30s pbp, while the second is the same data followed by a denoising step implemented by a fully convolutional Dnn architecture trained under perceptual loss [1,2]. The purpose of this challenge is the detection of “hot spots”, that is locations that have an elevated standard uptake value (SUV) and potential clinical significance. Corresponding CT scans are also provided. The ground truth, common to both datasets, was generated by Dr. Liran Domachevsky, chair of nuclear medicine at Sheba medical center. It consists of a 3-D segmentation map of the hot spots as well as an Excel file containing the position and size of a 3D cuboid bounding box for each hot spot.","https://rumc-gcorg-p-public.s3.amazonaws.com/logos/challenge/605/IMG_19052021_144815_600_x_600_pixel.jpg","https://fastpet-ld.grand-challenge.org/","active","5","","\N","\N","\N","2023-11-08 00:42:00","2023-11-15 22:35:52" "381","autoimplant2021","AutoImplant 2021","Automatic cranial implant design challenge","Please see our AutoImplant 2020 website for an overview of the cranial implant design topic. Our 2nd AutoImplant Challenge (referred to as AutoImplant 2021) sees the (not limited to) following three major improvements compared to the prior edition, besides a stronger team: Real craniotomy defective skulls will be provided in the evaluation phase. Task specific metrics (e.g., boundary Dice Score) that are optimally in agreement with the clinical criteria of cranial implant design will be implemented and used. Besides a metric-based scoring and ranking system, neurosurgeons will be invited to verify, score and rank the participants-submitted cranial implants based their clinical usability (for the real cases in Task 2).","https://rumc-gcorg-p-public.s3.amazonaws.com/logos/challenge/607/AutoImplant_2021_Logo.png","https://autoimplant2021.grand-challenge.org/","completed","5","https://doi.org/10.1109/tmi.2021.3077047","\N","\N","\N","2023-11-08 00:42:00","2023-11-16 17:41:01" "382","dfu-2021","DFUC2021","Diabetic foot ulcer challenge 2021","We have received approval from the UK National Health Service (NHS) Re-search Ethics Committee (REC) to use these images for the purpose of research. The NHS REC reference number is 15/NW/0539. Foot images with DFU were collected from the Lancashire Teaching Hospital over the past few years. Three cameras were used for capturing the foot images, Kodak DX4530, Nikon D3300and Nikon COOLPIX P100. The images were acquired with close-ups of the full foot at a distance of around 30–40 cm with the parallel orientation to the plane of an ulcer. The use of flash as the primary light source was avoided, and instead, adequate room lights were used to get the consistent colours in images. Images were acquired by a podiatrist and a consultant physician with specialization in the diabetic foot, both with more than 5 years professional experience. As a pre-processing stage, we have discarded photographs with out of focus and blurry artefacts. The DFUC2021 consists of 15,683 DFU patche...","https://rumc-gcorg-p-public.s3.amazonaws.com/logos/challenge/608/footsnap_logo.png","https://dfu-2021.grand-challenge.org/","active","5","https://doi.org/10.1007/978-3-030-94907-5_7","\N","\N","\N","2023-11-08 00:42:00","2023-11-16 17:41:08" diff --git a/apps/openchallenges/challenge-to-elasticsearch-service/project.json b/apps/openchallenges/challenge-to-elasticsearch-service/project.json index 15154124b4..fc7c3ba05a 100644 --- a/apps/openchallenges/challenge-to-elasticsearch-service/project.json +++ b/apps/openchallenges/challenge-to-elasticsearch-service/project.json @@ -19,29 +19,33 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/challenge-to-elasticsearch-service" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/challenge-to-elasticsearch-service" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/challenge-to-elasticsearch-service" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/challenge-to-elasticsearch-service" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } }, "serve": { @@ -61,13 +65,13 @@ }, "dependsOn": [] }, - "build-image": { - "executor": "@nxrocks/nx-spring-boot:build-image", - "options": { - "root": "apps/openchallenges/challenge-to-elasticsearch-service" - }, - "dependsOn": ["^install"] - }, + // "build-image": { + // "executor": "@nxrocks/nx-spring-boot:build-image", + // "options": { + // "root": "apps/openchallenges/challenge-to-elasticsearch-service" + // }, + // "dependsOn": ["^install"] + // }, "generate": { "executor": "nx:run-commands", "options": { diff --git a/apps/openchallenges/config-server/project.json b/apps/openchallenges/config-server/project.json index 04cafc353e..7f85a9594e 100644 --- a/apps/openchallenges/config-server/project.json +++ b/apps/openchallenges/config-server/project.json @@ -19,35 +19,42 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/config-server" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/config-server" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/config-server" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/config-server" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/config-server" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } }, "serve": { @@ -67,9 +74,10 @@ "dependsOn": [] }, "build-image-base": { - "executor": "@nxrocks/nx-spring-boot:build-image", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/config-server" + "command": "./gradlew bootBuildImage", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, diff --git a/apps/openchallenges/core-service/project.json b/apps/openchallenges/core-service/project.json index 9ad09d5d05..a1233f3d7b 100644 --- a/apps/openchallenges/core-service/project.json +++ b/apps/openchallenges/core-service/project.json @@ -19,17 +19,19 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/core-service" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/core-service" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "serve": { @@ -48,14 +50,14 @@ "cwd": "apps/openchallenges/core-service" }, "dependsOn": [] - }, - "build-image": { - "executor": "@nxrocks/nx-spring-boot:build-image", - "options": { - "root": "apps/openchallenges/core-service" - }, - "dependsOn": ["^install"] } + // "build-image": { + // "executor": "@nxrocks/nx-spring-boot:build-image", + // "options": { + // "root": "apps/openchallenges/core-service" + // }, + // "dependsOn": ["^install"] + // } }, "tags": ["type:service", "scope:backend", "language:java", "package-manager:gradle"], "implicitDependencies": [ diff --git a/apps/openchallenges/edam-etl/Dockerfile b/apps/openchallenges/edam-etl/Dockerfile index d44a3827e0..5f6503f053 100644 --- a/apps/openchallenges/edam-etl/Dockerfile +++ b/apps/openchallenges/edam-etl/Dockerfile @@ -1,6 +1,20 @@ FROM python:3.12.0-slim -ENV APP_DIR=/opt/app +ARG USERNAME=app +ARG USER_UID=1000 +ARG USER_GID=$USER_UID +ENV APP_DIR=/opt/app \ + APP_USERNAME=${USERNAME} + +RUN groupadd --gid $USER_GID $USERNAME \ + && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \ + # Install sudo + && apt-get update -qq -y && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install --no-install-recommends -qq -y \ + gosu \ + && apt-get -y autoclean \ + && apt-get -y autoremove \ + && rm -rf /var/lib/apt/lists/* WORKDIR ${APP_DIR} COPY src src/ @@ -19,4 +33,4 @@ RUN chmod +x docker-entrypoint.sh ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["python", "${APP_DIR}/src/main.py"] \ No newline at end of file +CMD ["python", "src/main.py"] \ No newline at end of file diff --git a/apps/openchallenges/edam-etl/docker-entrypoint.sh b/apps/openchallenges/edam-etl/docker-entrypoint.sh index 6f39dcde57..c4d7c4c2d7 100644 --- a/apps/openchallenges/edam-etl/docker-entrypoint.sh +++ b/apps/openchallenges/edam-etl/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -e if [ "$1" = 'python' ]; then cd ${APP_DIR} - exec gosu www-data "$@" + exec gosu "$APP_USERNAME" "$@" fi exec "$@" \ No newline at end of file diff --git a/apps/openchallenges/image-service/project.json b/apps/openchallenges/image-service/project.json index 7c5be5477b..5f3a32ad42 100644 --- a/apps/openchallenges/image-service/project.json +++ b/apps/openchallenges/image-service/project.json @@ -19,17 +19,20 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/image-service" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/image-service" + "command": "./gradlew test", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, @@ -42,21 +45,24 @@ "dependsOn": ["test"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/image-service" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/image-service" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/image-service" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } }, "serve": { @@ -79,9 +85,10 @@ "dependsOn": [] }, "build-image-base": { - "executor": "@nxrocks/nx-spring-boot:build-image", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/image-service" + "command": "./gradlew bootBuildImage", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, @@ -133,7 +140,7 @@ "tags": ["type:service", "scope:backend", "language:java", "package-manager:gradle"], "implicitDependencies": [ "openchallenges-api-description", - "openchallenges-app-config-data", + "openchallenges-app-config-data", "shared-java-util" ] } diff --git a/apps/openchallenges/kaggle-to-kafka-service/project.json b/apps/openchallenges/kaggle-to-kafka-service/project.json index 5015938e72..a8f6f7b866 100644 --- a/apps/openchallenges/kaggle-to-kafka-service/project.json +++ b/apps/openchallenges/kaggle-to-kafka-service/project.json @@ -19,29 +19,33 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/kaggle-to-kafka-service" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/kaggle-to-kafka-service" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/kaggle-to-kafka-service" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/kaggle-to-kafka-service" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } }, "serve": { @@ -61,13 +65,13 @@ }, "dependsOn": [] }, - "build-image": { - "executor": "@nxrocks/nx-spring-boot:build-image", - "options": { - "root": "apps/openchallenges/kaggle-to-kafka-service" - }, - "dependsOn": ["^install"] - }, + // "build-image": { + // "executor": "@nxrocks/nx-spring-boot:build-image", + // "options": { + // "root": "apps/openchallenges/kaggle-to-kafka-service" + // }, + // "dependsOn": ["^install"] + // }, "generate": { "executor": "nx:run-commands", "options": { diff --git a/apps/openchallenges/organization-service/project.json b/apps/openchallenges/organization-service/project.json index 614c7cb055..fed2bcedc9 100644 --- a/apps/openchallenges/organization-service/project.json +++ b/apps/openchallenges/organization-service/project.json @@ -19,17 +19,20 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "{projectRoot}" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "{projectRoot}" + "command": "./gradlew test", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, @@ -42,21 +45,24 @@ "dependsOn": ["test"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "{projectRoot}" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "{projectRoot}" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "{projectRoot}" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } }, "serve": { @@ -79,9 +85,10 @@ "dependsOn": [] }, "build-image-base": { - "executor": "@nxrocks/nx-spring-boot:build-image", + "executor": "nx:run-commands", "options": { - "root": "{projectRoot}" + "command": "./gradlew bootBuildImage", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, @@ -133,7 +140,7 @@ "tags": ["type:service", "scope:backend", "language:java", "package-manager:gradle"], "implicitDependencies": [ "openchallenges-api-description", - "openchallenges-app-config-data", + "openchallenges-app-config-data", "shared-java-util" ] } diff --git a/apps/openchallenges/service-registry/project.json b/apps/openchallenges/service-registry/project.json index 7f823bbc3b..616ff987ce 100644 --- a/apps/openchallenges/service-registry/project.json +++ b/apps/openchallenges/service-registry/project.json @@ -19,23 +19,28 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/service-registry" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/service-registry" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/service-registry" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "serve": { @@ -55,9 +60,10 @@ "dependsOn": [] }, "build-image-base": { - "executor": "@nxrocks/nx-spring-boot:build-image", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/service-registry" + "command": "./gradlew bootBuildImage", + "cwd": "{projectRoot}" }, "dependsOn": ["^install"] }, diff --git a/apps/openchallenges/user-service/project.json b/apps/openchallenges/user-service/project.json index 70afa9b431..d0e25888b5 100644 --- a/apps/openchallenges/user-service/project.json +++ b/apps/openchallenges/user-service/project.json @@ -19,29 +19,33 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "apps/openchallenges/user-service" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}"], "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/user-service" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/user-service" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "apps/openchallenges/user-service" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } }, "serve": { @@ -61,13 +65,13 @@ }, "dependsOn": [] }, - "build-image": { - "executor": "@nxrocks/nx-spring-boot:build-image", - "options": { - "root": "apps/openchallenges/user-service" - }, - "dependsOn": ["^install"] - }, + // "build-image": { + // "executor": "@nxrocks/nx-spring-boot:build-image", + // "options": { + // "root": "apps/openchallenges/user-service" + // }, + // "dependsOn": ["^install"] + // }, "generate": { "executor": "nx:run-commands", "options": { diff --git a/apps/schematic/api/Dockerfile b/apps/schematic/api/Dockerfile index f5cd30876d..a357e2f229 100644 --- a/apps/schematic/api/Dockerfile +++ b/apps/schematic/api/Dockerfile @@ -41,7 +41,8 @@ COPY ./self-signed.conf ./ssl-params.conf ./certificate.conf ./ COPY uwsgi.ini /app/uwsgi.ini # copy files relevant for schematic apis -COPY schematic_api pyproject.toml poetry.lock /app/app/ +COPY pyproject.toml poetry.lock /app/app/ +COPY ./schematic_api /app/app/schematic_api # install dependencies WORKDIR /app/app diff --git a/apps/schematic/api/README.md b/apps/schematic/api/README.md index 9aad77535c..426bb2606e 100644 --- a/apps/schematic/api/README.md +++ b/apps/schematic/api/README.md @@ -33,10 +33,10 @@ nx prepare schematic-api # This step adds SSL private key and certificate as environment variable in .env file python3 apps/schematic/api/prepare_key_certificate.py -# building the image +# Running the following command from root (/workspaces/sage-monorepo) to build the image nx build-image schematic-api -# Start the containerized REST API with: +# In the same location as above, start the containerized REST API with: nx serve-detach schematic-api ``` You could open your browser here: diff --git a/apps/schematic/api/schematic_api/__main__.py b/apps/schematic/api/schematic_api/__main__.py index e61df0561a..48ce93b55c 100644 --- a/apps/schematic/api/schematic_api/__main__.py +++ b/apps/schematic/api/schematic_api/__main__.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 - import connexion from flask_cors import CORS import flask @@ -18,7 +17,7 @@ def main(): - app.run(port=7080, debug=False) + app.run(port=7443, debug=False) if __name__ == "__main__": diff --git a/apps/schematic/api/schematic_api/main.py b/apps/schematic/api/schematic_api/main.py deleted file mode 100644 index 7666a5d5b1..0000000000 --- a/apps/schematic/api/schematic_api/main.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python3 -import connexion -from flask_cors import CORS -import flask -from schematic_api import encoder - -app = connexion.App(__name__, specification_dir="./openapi/") -app.app.json_encoder = encoder.JSONEncoder -app.add_api( - "openapi.yaml", arguments={"title": "Schematic REST API"}, pythonic_params=True -) -app.add_url_rule("/", "ui", lambda: flask.redirect("/api/v1/ui")) - -# add CORS support -# https://connexion.readthedocs.io/en/latest/cookbook.html#cors-support -CORS(app.app, resources={r"/api/*": {"origins": "*"}}) - - -def main(): - app.run(port=80, debug=False) - - -if __name__ == "__main__": - main() diff --git a/apps/schematic/api/uwsgi.ini b/apps/schematic/api/uwsgi.ini index 434cf70cfb..cd6de421a2 100644 --- a/apps/schematic/api/uwsgi.ini +++ b/apps/schematic/api/uwsgi.ini @@ -1,7 +1,7 @@ [uwsgi] # The variables http and *-socket are passed as command line arguments and # must not be specified in this file. -wsgi-file = schematic_api/main.py +wsgi-file = schematic_api/__main__.py callable = app uid = www-data gid = www-data diff --git a/docker/openchallenges/services/challenge-service.yml b/docker/openchallenges/services/challenge-service.yml index 823f508fb7..c2f9b73aa1 100644 --- a/docker/openchallenges/services/challenge-service.yml +++ b/docker/openchallenges/services/challenge-service.yml @@ -23,8 +23,8 @@ services: depends_on: openchallenges-config-server: condition: service_healthy - openchallenges-edam-etl: - condition: service_completed_successfully + # openchallenges-edam-etl: + # condition: service_completed_successfully openchallenges-elasticsearch: condition: service_healthy openchallenges-mariadb: diff --git a/libs/openchallenges/app-config-data/project.json b/libs/openchallenges/app-config-data/project.json index 3533ae7b43..f628cc42d6 100644 --- a/libs/openchallenges/app-config-data/project.json +++ b/libs/openchallenges/app-config-data/project.json @@ -12,11 +12,13 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/app-config-data" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}/build"] + "dependsOn": ["^install"] }, "install": { "executor": "nx:run-commands", @@ -27,27 +29,33 @@ "dependsOn": ["build"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/app-config-data" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/app-config-data" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/app-config-data" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/app-config-data" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } } }, diff --git a/libs/openchallenges/kafka-admin/project.json b/libs/openchallenges/kafka-admin/project.json index 2c976b8b66..550062dafe 100644 --- a/libs/openchallenges/kafka-admin/project.json +++ b/libs/openchallenges/kafka-admin/project.json @@ -12,11 +12,12 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/kafka-admin" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}/build"], "dependsOn": ["^install"] }, "install": { @@ -28,27 +29,33 @@ "dependsOn": ["build"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/kafka-admin" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-admin" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-admin" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-admin" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } } }, diff --git a/libs/openchallenges/kafka-consumer/project.json b/libs/openchallenges/kafka-consumer/project.json index 636172d7ff..21c5458083 100644 --- a/libs/openchallenges/kafka-consumer/project.json +++ b/libs/openchallenges/kafka-consumer/project.json @@ -12,11 +12,12 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/kafka-consumer" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}/build"], "dependsOn": ["^install"] }, "install": { @@ -28,27 +29,33 @@ "dependsOn": ["build"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/kafka-consumer" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-consumer" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-consumer" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-consumer" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } } }, diff --git a/libs/openchallenges/kafka-model/project.json b/libs/openchallenges/kafka-model/project.json index edcd126e41..3fb484088e 100644 --- a/libs/openchallenges/kafka-model/project.json +++ b/libs/openchallenges/kafka-model/project.json @@ -12,11 +12,13 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/kafka-model" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}/build"] + "dependsOn": ["^install"] }, "avro-generate": { "executor": "nx:run-commands", @@ -39,15 +41,19 @@ "dependsOn": ["build"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/kafka-model" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-model" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } } }, diff --git a/libs/openchallenges/kafka-producer/project.json b/libs/openchallenges/kafka-producer/project.json index 39f33a4b40..fe25f5144a 100644 --- a/libs/openchallenges/kafka-producer/project.json +++ b/libs/openchallenges/kafka-producer/project.json @@ -12,11 +12,12 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/kafka-producer" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}/build"], "dependsOn": ["^install"] }, "install": { @@ -28,27 +29,33 @@ "dependsOn": ["build"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/openchallenges/kafka-producer" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-producer" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } }, "format": { - "executor": "@nxrocks/nx-spring-boot:format", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-producer" + "command": "./gradlew spotlessApply", + "cwd": "{projectRoot}" } }, "format-check": { - "executor": "@nxrocks/nx-spring-boot:check-format", + "executor": "nx:run-commands", "options": { - "root": "libs/openchallenges/kafka-producer" + "command": "./gradlew spotlessCheck", + "cwd": "{projectRoot}" } } }, diff --git a/libs/shared/java/util/project.json b/libs/shared/java/util/project.json index 95461dc69c..22883a50eb 100644 --- a/libs/shared/java/util/project.json +++ b/libs/shared/java/util/project.json @@ -12,11 +12,13 @@ } }, "build": { - "executor": "@nxrocks/nx-spring-boot:build", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/shared/java/util" + "command": "./gradlew build", + "cwd": "{projectRoot}" }, - "outputs": ["{projectRoot}/build"] + "dependsOn": ["^install"] }, "install": { "executor": "nx:run-commands", @@ -27,15 +29,19 @@ "dependsOn": ["build"] }, "test": { - "executor": "@nxrocks/nx-spring-boot:test", + "executor": "nx:run-commands", + "outputs": ["{projectRoot}/build"], "options": { - "root": "libs/shared/java/util" - } + "command": "./gradlew test", + "cwd": "{projectRoot}" + }, + "dependsOn": ["^install"] }, "clean": { - "executor": "@nxrocks/nx-spring-boot:clean", + "executor": "nx:run-commands", "options": { - "root": "libs/shared/java/util" + "command": "./gradlew clean", + "cwd": "{projectRoot}" } } }, diff --git a/nx.json b/nx.json index 664df92f5f..24487a82d0 100644 --- a/nx.json +++ b/nx.json @@ -30,7 +30,7 @@ } }, "defaultProject": "openchallenges-app", - "plugins": ["@nxrocks/nx-spring-boot"], + "plugins": [], "$schema": "./node_modules/nx/schemas/nx-schema.json", "targetDefaults": { "build": { diff --git a/package.json b/package.json index 420df10dd3..fd3c68fb5e 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,6 @@ "@nx/plugin": "16.7.2", "@nx/web": "16.7.2", "@nx/workspace": "16.7.2", - "@nxrocks/nx-spring-boot": "8.0.3", "@openapitools/openapi-generator-cli": "2.5.2", "@playwright/test": "^1.36.0", "@prettier/plugin-xml": "2.2.0", diff --git a/yarn.lock b/yarn.lock index 4320209618..6a32175b07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6646,39 +6646,6 @@ __metadata: languageName: node linkType: hard -"@nxrocks/common@npm:2.4.3": - version: 2.4.3 - resolution: "@nxrocks/common@npm:2.4.3" - dependencies: - hpagent: ^1.2.0 - unzipper: ^0.10.11 - xmlbuilder2: ^3.1.0 - xpath: ^0.0.32 - peerDependencies: - "@nx/devkit": ">=16.0.0" - "@nx/workspace": ">=16.0.0" - checksum: 2e3d76ded4d6dd336bb33b59630caabdd1e91894b002c78c79e2bee7fefb34e0ddc1c5a810b6e223b1ea24c9d4e521437949ed4088ec97b6df445f7cb162b7b2 - languageName: node - linkType: hard - -"@nxrocks/nx-spring-boot@npm:8.0.3": - version: 8.0.3 - resolution: "@nxrocks/nx-spring-boot@npm:8.0.3" - dependencies: - "@nxrocks/common": 2.4.3 - enquirer: ^2.3.6 - hpagent: ^1.2.0 - node-fetch: ^2.6.1 - unzipper: ^0.10.11 - xmlbuilder2: ^3.1.0 - xpath: ^0.0.32 - peerDependencies: - "@nx/devkit": ">=16.0.0" - "@nx/workspace": ">=16.0.0" - checksum: 584d4a1398359a5cb83957283aa0567b086ce551940689cd76a1b43791893bbf41660ecd5462cdd7f101e67881103488625841d862fa19990b5d1dc3822c25c1 - languageName: node - linkType: hard - "@octokit/auth-app@npm:^4.0.2": version: 4.0.13 resolution: "@octokit/auth-app@npm:4.0.13" @@ -7026,43 +6993,6 @@ __metadata: languageName: node linkType: hard -"@oozcitak/dom@npm:1.15.10": - version: 1.15.10 - resolution: "@oozcitak/dom@npm:1.15.10" - dependencies: - "@oozcitak/infra": 1.0.8 - "@oozcitak/url": 1.0.4 - "@oozcitak/util": 8.3.8 - checksum: c83f5dc778b12f8e52e35fac0aa741bfac074faf3f3b60345723de46cba4c8ef0dced2839379fb93e21007f52336f875cf9ddfff6c598020b0688cb7d6f03ec7 - languageName: node - linkType: hard - -"@oozcitak/infra@npm:1.0.8": - version: 1.0.8 - resolution: "@oozcitak/infra@npm:1.0.8" - dependencies: - "@oozcitak/util": 8.3.8 - checksum: fc76a17187d67df39cf38ae8138ce1757d6b86e5d2ff3c90f5db12194380005b4e22fb6caec4bd40dce363fb8c89f6f945bb0577e6ecee59755773b7ff793164 - languageName: node - linkType: hard - -"@oozcitak/url@npm:1.0.4": - version: 1.0.4 - resolution: "@oozcitak/url@npm:1.0.4" - dependencies: - "@oozcitak/infra": 1.0.8 - "@oozcitak/util": 8.3.8 - checksum: ab4a9726b447910e093c0efcb92c4486e1bc314e0c9375f1a4082d1f0b2cc80bbfd433cc6953641b1ddaf73df21bd7002bb5cf581d8ff104a9eac5d21633b781 - languageName: node - linkType: hard - -"@oozcitak/util@npm:8.3.8": - version: 8.3.8 - resolution: "@oozcitak/util@npm:8.3.8" - checksum: 3aaa936fb3ba5a8561b54f41ef55cbba633b52f7f95c74e9c4a8068e3cbe893dc30865a24483d3887a0d8a201ee4584daf51f0a177fb8e5997c0bdd289c4f559 - languageName: node - linkType: hard - "@openapitools/openapi-generator-cli@npm:2.5.2": version: 2.5.2 resolution: "@openapitools/openapi-generator-cli@npm:2.5.2" @@ -10397,13 +10327,6 @@ __metadata: languageName: node linkType: hard -"big-integer@npm:^1.6.17": - version: 1.6.51 - resolution: "big-integer@npm:1.6.51" - checksum: 3d444173d1b2e20747e2c175568bedeebd8315b0637ea95d75fd27830d3b8e8ba36c6af40374f36bdaea7b5de376dcada1b07587cb2a79a928fccdb6e6e3c518 - languageName: node - linkType: hard - "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -10449,16 +10372,6 @@ __metadata: languageName: node linkType: hard -"binary@npm:~0.3.0": - version: 0.3.0 - resolution: "binary@npm:0.3.0" - dependencies: - buffers: ~0.1.1 - chainsaw: ~0.1.0 - checksum: b4699fda9e2c2981e74a46b0115cf0d472eda9b68c0e9d229ef494e92f29ce81acf0a834415094cffcc340dfee7c4ef8ce5d048c65c18067a7ed850323f777af - languageName: node - linkType: hard - "bl@npm:^1.0.0": version: 1.2.3 resolution: "bl@npm:1.2.3" @@ -10494,13 +10407,6 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:~3.4.1": - version: 3.4.7 - resolution: "bluebird@npm:3.4.7" - checksum: bffa9dee7d3a41ab15c4f3f24687b49959b4e64e55c058a062176feb8ccefc2163414fb4e1a0f3053bf187600936509660c3ebd168fd9f0e48c7eba23b019466 - languageName: node - linkType: hard - "body-parser@npm:1.20.1": version: 1.20.1 resolution: "body-parser@npm:1.20.1" @@ -10754,13 +10660,6 @@ __metadata: languageName: node linkType: hard -"buffer-indexof-polyfill@npm:~1.0.0": - version: 1.0.2 - resolution: "buffer-indexof-polyfill@npm:1.0.2" - checksum: fbfb2d69c6bb2df235683126f9dc140150c08ac3630da149913a9971947b667df816a913b6993bc48f4d611999cb99a1589914d34c02dccd2234afda5cb75bbc - languageName: node - linkType: hard - "buffer@npm:4.9.2": version: 4.9.2 resolution: "buffer@npm:4.9.2" @@ -10782,13 +10681,6 @@ __metadata: languageName: node linkType: hard -"buffers@npm:~0.1.1": - version: 0.1.1 - resolution: "buffers@npm:0.1.1" - checksum: ad6f8e483efab39cefd92bdc04edbff6805e4211b002f4d1cfb70c6c472a61cc89fb18c37bcdfdd4ee416ca096e9ff606286698a7d41a18b539bac12fd76d4d5 - languageName: node - linkType: hard - "builtin-modules@npm:^3.3.0": version: 3.3.0 resolution: "builtin-modules@npm:3.3.0" @@ -11050,15 +10942,6 @@ __metadata: languageName: node linkType: hard -"chainsaw@npm:~0.1.0": - version: 0.1.0 - resolution: "chainsaw@npm:0.1.0" - dependencies: - traverse: ">=0.3.0 <0.4" - checksum: 22a96b9fb0cd9fb20813607c0869e61817d1acc81b5d455cc6456b5e460ea1dd52630e0f76b291cf8294bfb6c1fc42e299afb52104af9096242699d6d3aa6d3e - languageName: node - linkType: hard - "chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.4.2": version: 2.4.2 resolution: "chalk@npm:2.4.2" @@ -13178,15 +13061,6 @@ __metadata: languageName: node linkType: hard -"duplexer2@npm:~0.1.4": - version: 0.1.4 - resolution: "duplexer2@npm:0.1.4" - dependencies: - readable-stream: ^2.0.2 - checksum: 744961f03c7f54313f90555ac20284a3fb7bf22fdff6538f041a86c22499560eb6eac9d30ab5768054137cb40e6b18b40f621094e0261d7d8c35a37b7a5ad241 - languageName: node - linkType: hard - "duplexer3@npm:^0.1.4": version: 0.1.5 resolution: "duplexer3@npm:0.1.5" @@ -15454,18 +15328,6 @@ __metadata: languageName: node linkType: hard -"fstream@npm:^1.0.12": - version: 1.0.12 - resolution: "fstream@npm:1.0.12" - dependencies: - graceful-fs: ^4.1.2 - inherits: ~2.0.0 - mkdirp: ">=0.5 0" - rimraf: 2 - checksum: e6998651aeb85fd0f0a8a68cec4d05a3ada685ecc4e3f56e0d063d0564a4fc39ad11a856f9020f926daf869fc67f7a90e891def5d48e4cadab875dc313094536 - languageName: node - linkType: hard - "function-bind@npm:^1.1.1": version: 1.1.1 resolution: "function-bind@npm:1.1.1" @@ -15954,7 +15816,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.10, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.1.10, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7 @@ -16231,7 +16093,7 @@ __metadata: languageName: node linkType: hard -"hpagent@npm:^1.2.0, hpagent@npm:~1.2.0": +"hpagent@npm:~1.2.0": version: 1.2.0 resolution: "hpagent@npm:1.2.0" checksum: b029da695edae438cee4da2a437386f9db4ac27b3ceb7306d02e1b586c9c194741ed2e943c8a222e0cfefaf27ee3f863aca7ba1721b0950a2a19bf25bc0d85e2 @@ -16688,7 +16550,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.0, inherits@npm:~2.0.3": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 @@ -18108,26 +17970,26 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:3.14.1, js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.0, js-yaml@npm:^3.14.1": - version: 3.14.1 - resolution: "js-yaml@npm:3.14.1" +"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0": + version: 4.1.0 + resolution: "js-yaml@npm:4.1.0" dependencies: - argparse: ^1.0.7 - esprima: ^4.0.0 + argparse: ^2.0.1 bin: js-yaml: bin/js-yaml.js - checksum: bef146085f472d44dee30ec34e5cf36bf89164f5d585435a3d3da89e52622dff0b188a580e4ad091c3341889e14cb88cac6e4deb16dc5b1e9623bb0601fc255c + checksum: c7830dfd456c3ef2c6e355cc5a92e6700ceafa1d14bba54497b34a99f0376cecbb3e9ac14d3e5849b426d5a5140709a66237a8c991c675431271c4ce5504151a languageName: node linkType: hard -"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0": - version: 4.1.0 - resolution: "js-yaml@npm:4.1.0" +"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.0, js-yaml@npm:^3.14.1": + version: 3.14.1 + resolution: "js-yaml@npm:3.14.1" dependencies: - argparse: ^2.0.1 + argparse: ^1.0.7 + esprima: ^4.0.0 bin: js-yaml: bin/js-yaml.js - checksum: c7830dfd456c3ef2c6e355cc5a92e6700ceafa1d14bba54497b34a99f0376cecbb3e9ac14d3e5849b426d5a5140709a66237a8c991c675431271c4ce5504151a + checksum: bef146085f472d44dee30ec34e5cf36bf89164f5d585435a3d3da89e52622dff0b188a580e4ad091c3341889e14cb88cac6e4deb16dc5b1e9623bb0601fc255c languageName: node linkType: hard @@ -19079,13 +18941,6 @@ __metadata: languageName: node linkType: hard -"listenercount@npm:~1.0.1": - version: 1.0.1 - resolution: "listenercount@npm:1.0.1" - checksum: 0f1c9077cdaf2ebc16473c7d72eb7de6d983898ca42500f03da63c3914b6b312dd5f7a90d2657691ea25adf3fe0ac5a43226e8b2c673fd73415ed038041f4757 - languageName: node - linkType: hard - "listr2@npm:^3.8.3": version: 3.14.0 resolution: "listr2@npm:3.14.0" @@ -20061,7 +19916,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:>=0.5 0, mkdirp@npm:^0.5.6": +"mkdirp@npm:^0.5.6": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" dependencies: @@ -23483,7 +23338,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6": +"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.5, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6": version: 2.3.8 resolution: "readable-stream@npm:2.3.8" dependencies: @@ -23995,17 +23850,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:2": - version: 2.7.1 - resolution: "rimraf@npm:2.7.1" - dependencies: - glob: ^7.1.3 - bin: - rimraf: ./bin.js - checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd - languageName: node - linkType: hard - "rimraf@npm:3.0.2, rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": version: 3.0.2 resolution: "rimraf@npm:3.0.2" @@ -24235,7 +24079,6 @@ __metadata: "@nx/plugin": 16.7.2 "@nx/web": 16.7.2 "@nx/workspace": 16.7.2 - "@nxrocks/nx-spring-boot": 8.0.3 "@openapitools/openapi-generator-cli": 2.5.2 "@playwright/test": ^1.36.0 "@prettier/plugin-xml": 2.2.0 @@ -24751,7 +24594,7 @@ __metadata: languageName: node linkType: hard -"setimmediate@npm:^1.0.5, setimmediate@npm:~1.0.4": +"setimmediate@npm:^1.0.5": version: 1.0.5 resolution: "setimmediate@npm:1.0.5" checksum: c9a6f2c5b51a2dabdc0247db9c46460152ffc62ee139f3157440bd48e7c59425093f42719ac1d7931f054f153e2d26cf37dfeb8da17a794a58198a2705e527fd @@ -26334,13 +26177,6 @@ __metadata: languageName: node linkType: hard -"traverse@npm:>=0.3.0 <0.4": - version: 0.3.9 - resolution: "traverse@npm:0.3.9" - checksum: 982982e4e249e9bbf063732a41fe5595939892758524bbef5d547c67cdf371b13af72b5434c6a61d88d4bb4351d6dabc6e22d832e0d16bc1bc684ef97a1cc59e - languageName: node - linkType: hard - "traverse@npm:^0.6.6": version: 0.6.7 resolution: "traverse@npm:0.6.7" @@ -26974,24 +26810,6 @@ __metadata: languageName: node linkType: hard -"unzipper@npm:^0.10.11": - version: 0.10.14 - resolution: "unzipper@npm:0.10.14" - dependencies: - big-integer: ^1.6.17 - binary: ~0.3.0 - bluebird: ~3.4.1 - buffer-indexof-polyfill: ~1.0.0 - duplexer2: ~0.1.4 - fstream: ^1.0.12 - graceful-fs: ^4.2.2 - listenercount: ~1.0.1 - readable-stream: ~2.3.6 - setimmediate: ~1.0.4 - checksum: b46ae9a72e4b4c224be6a8f46447dd7cb3761a59450827e869747c4564a8f555f877fc19c7e3b5d146127a7dd3e2ffea186116682f6646e64479f99dd23565bc - languageName: node - linkType: hard - "update-browserslist-db@npm:^1.0.11": version: 1.0.11 resolution: "update-browserslist-db@npm:1.0.11" @@ -27953,18 +27771,6 @@ __metadata: languageName: node linkType: hard -"xmlbuilder2@npm:^3.1.0": - version: 3.1.1 - resolution: "xmlbuilder2@npm:3.1.1" - dependencies: - "@oozcitak/dom": 1.15.10 - "@oozcitak/infra": 1.0.8 - "@oozcitak/util": 8.3.8 - js-yaml: 3.14.1 - checksum: fdcd38d271f1571972ec1facda5bb0d441c4d7d4fa0696cb591a1804549527c462479937194329a453ae5efcd5110c6d3a3d6cf98e210afa2c78bd0400fc6d3c - languageName: node - linkType: hard - "xmlbuilder@npm:^15.1.1": version: 15.1.1 resolution: "xmlbuilder@npm:15.1.1" @@ -27993,13 +27799,6 @@ __metadata: languageName: node linkType: hard -"xpath@npm:^0.0.32": - version: 0.0.32 - resolution: "xpath@npm:0.0.32" - checksum: 887e9747b960ea45fb47a9464744424512de0a49205e82c2ad6be662d7a2f1a75145662a143304340864c6da68fd8d767cce4065cc198ee07a3d4897e0a3d4bb - languageName: node - linkType: hard - "xregexp@npm:4.4.1": version: 4.4.1 resolution: "xregexp@npm:4.4.1"