From 978d1490daae992de684fe11dea290bcca195619 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 7 Nov 2024 16:14:23 -0500 Subject: [PATCH 1/3] remove modules that are not part of the product --- addons/common/persistence/pom.xml | 5 ----- addons/common/pom.xml | 8 -------- api/pom.xml | 11 ----------- drools/pom.xml | 6 ------ jbpm/pom.xml | 2 -- kogito-codegen-modules/pom.xml | 5 ----- kogito-serverless-workflow/pom.xml | 1 - pom.xml | 2 -- quarkus/addons/events/pom.xml | 4 ---- quarkus/addons/jobs/pom.xml | 1 - quarkus/addons/persistence/pom.xml | 6 ------ quarkus/addons/pom.xml | 8 -------- quarkus/extensions/kogito-quarkus-extension/pom.xml | 2 -- quarkus/extensions/pom.xml | 6 ------ quarkus/integration-tests/pom.xml | 12 ------------ 15 files changed, 79 deletions(-) diff --git a/addons/common/persistence/pom.xml b/addons/common/persistence/pom.xml index eb2beb84ec3..64c8922561e 100644 --- a/addons/common/persistence/pom.xml +++ b/addons/common/persistence/pom.xml @@ -35,11 +35,6 @@ jdbc ddl - infinispan - filesystem - mongodb - postgresql - rocksdb diff --git a/addons/common/pom.xml b/addons/common/pom.xml index 9dff291daa9..8b62c7c50e3 100644 --- a/addons/common/pom.xml +++ b/addons/common/pom.xml @@ -46,16 +46,8 @@ kubernetes kubernetes-service-catalog jobs - events monitoring - explainability - human-task-prediction - mail - tracing - task-management - marshallers flyway - jbpm-usertask-storage-jpa diff --git a/api/pom.xml b/api/pom.xml index b80ac7f99bb..fea9fbf4bfa 100755 --- a/api/pom.xml +++ b/api/pom.xml @@ -43,17 +43,6 @@ kogito-services kogito-timer kogito-jobs-service-api - kogito-api-incubation-common - kogito-api-incubation-common-objectmapper - kogito-api-incubation-application - kogito-api-incubation-processes - kogito-api-incubation-processes-services - kogito-api-incubation-predictions - kogito-api-incubation-predictions-services - kogito-api-incubation-decisions - kogito-api-incubation-decisions-services - kogito-api-incubation-rules - kogito-api-incubation-rules-services diff --git a/drools/pom.xml b/drools/pom.xml index 08bfe5aece5..c6598aaeff7 100755 --- a/drools/pom.xml +++ b/drools/pom.xml @@ -46,12 +46,6 @@ kogito-drools kogito-dmn - kogito-pmml-api-dependencies - kogito-efesto-drl - kogito-pmml-dependencies - kogito-pmml-openapi - kogito-pmml - kogito-scenario-simulation diff --git a/jbpm/pom.xml b/jbpm/pom.xml index 3a038a58b73..4261be1e012 100755 --- a/jbpm/pom.xml +++ b/jbpm/pom.xml @@ -48,7 +48,6 @@ process-workitems jbpm-usertask jbpm-usertask-workitem - jbpm-tools jbpm-deps-groups @@ -61,7 +60,6 @@ - jbpm-tests diff --git a/kogito-codegen-modules/pom.xml b/kogito-codegen-modules/pom.xml index 74f86176885..cea0eb29016 100644 --- a/kogito-codegen-modules/pom.xml +++ b/kogito-codegen-modules/pom.xml @@ -40,11 +40,6 @@ kogito-codegen-api kogito-codegen-processes kogito-codegen-processes-integration-tests - kogito-codegen-rules - kogito-codegen-decisions - kogito-codegen-predictions - kogito-codegen-integration-tests - kogito-codegen-sample diff --git a/kogito-serverless-workflow/pom.xml b/kogito-serverless-workflow/pom.xml index c4c73b470e8..de54187fc7b 100644 --- a/kogito-serverless-workflow/pom.xml +++ b/kogito-serverless-workflow/pom.xml @@ -54,7 +54,6 @@ kogito-jsonpath-expression kogito-jq-expression kogito-serverless-workflow-executor - kogito-serverless-workflow-executor-tests kogito-serverless-workflow-dmn-parser kogito-serverless-workflow-dmn kogito-serverless-workflow-monitoring diff --git a/pom.xml b/pom.xml index 6a39da77301..fa940d93176 100644 --- a/pom.xml +++ b/pom.xml @@ -161,8 +161,6 @@ addons kogito-workitems kogito-serverless-workflow - kogito-maven-plugin - springboot diff --git a/quarkus/addons/events/pom.xml b/quarkus/addons/events/pom.xml index 474ff058578..864daba4c7b 100644 --- a/quarkus/addons/events/pom.xml +++ b/quarkus/addons/events/pom.xml @@ -36,10 +36,6 @@ process - decisions - predictions - rules - mongodb \ No newline at end of file diff --git a/quarkus/addons/jobs/pom.xml b/quarkus/addons/jobs/pom.xml index ec4b2539d91..5b18e763ab2 100644 --- a/quarkus/addons/jobs/pom.xml +++ b/quarkus/addons/jobs/pom.xml @@ -36,7 +36,6 @@ common management - messaging knative-eventing diff --git a/quarkus/addons/persistence/pom.xml b/quarkus/addons/persistence/pom.xml index 1cad7aa49e8..40905749840 100644 --- a/quarkus/addons/persistence/pom.xml +++ b/quarkus/addons/persistence/pom.xml @@ -36,12 +36,6 @@ jdbc - infinispan - kafka - filesystem - mongodb - postgresql - rocksdb \ No newline at end of file diff --git a/quarkus/addons/pom.xml b/quarkus/addons/pom.xml index f2ba7b6d45e..1420a025a33 100644 --- a/quarkus/addons/pom.xml +++ b/quarkus/addons/pom.xml @@ -51,16 +51,8 @@ fabric8-kubernetes-service-catalog microprofile-config-service-catalog jobs - explainability - mail monitoring - process-svg - task-notification - task-management - marshallers - process-definitions dynamic - jbpm-usertask-storage-jpa diff --git a/quarkus/extensions/kogito-quarkus-extension/pom.xml b/quarkus/extensions/kogito-quarkus-extension/pom.xml index 2c7ad669995..2c37534d1f1 100644 --- a/quarkus/extensions/kogito-quarkus-extension/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension/pom.xml @@ -38,8 +38,6 @@ kogito-quarkus-deployment kogito-quarkus - kogito-quarkus-integration-test - kogito-quarkus-integration-test-maven-devmode \ No newline at end of file diff --git a/quarkus/extensions/pom.xml b/quarkus/extensions/pom.xml index 096922e8750..17b2213d383 100644 --- a/quarkus/extensions/pom.xml +++ b/quarkus/extensions/pom.xml @@ -52,12 +52,6 @@ kogito-quarkus-extension-common kogito-quarkus-workflow-extension-common kogito-quarkus-serverless-workflow-extension - kogito-quarkus-extension - kogito-quarkus-incubation-common - kogito-quarkus-processes-extension - kogito-quarkus-rules-extension - kogito-quarkus-decisions-extension - kogito-quarkus-predictions-extension diff --git a/quarkus/integration-tests/pom.xml b/quarkus/integration-tests/pom.xml index 266f129ebc8..5abbc83c94d 100644 --- a/quarkus/integration-tests/pom.xml +++ b/quarkus/integration-tests/pom.xml @@ -37,19 +37,7 @@ integration-tests-quarkus-openapi-client - integration-tests-quarkus-rules - integration-tests-quarkus-legacy-rules - integration-tests-quarkus-decisions - integration-tests-quarkus-resteasy-classic - integration-tests-quarkus-resteasy-reactive - integration-tests-kogito-plugin - integration-tests-quarkus-norest - integration-tests-quarkus-processes - integration-tests-quarkus-processes-reactive - integration-tests-quarkus-processes-persistence - integration-tests-quarkus-usertasks - integration-tests-quarkus-source-files \ No newline at end of file From 752971e5fbc1b46a138bd8b96dec8882e11f560d Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Tue, 6 Feb 2024 11:32:11 +0100 Subject: [PATCH 2/3] add -Dproductized profile for PR checks The productized profile is still needed as there are still some leftovers of it in upstream code that was not removed yet --- .github/workflows/pr-downstream.yml | 5 ++++- .github/workflows/pr-kogito-runtimes.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index ad13eb8f92e..cd30e8c2683 100644 --- a/.github/workflows/pr-downstream.yml +++ b/.github/workflows/pr-downstream.yml @@ -27,16 +27,19 @@ jobs: include: - job_name: kogito-apps repository: kogito-apps - env_BUILD_MVN_OPTS: "-DskipUI" + env_BUILD_MVN_OPTS: "-DskipUI -Dproductized" - job_name: kogito-quarkus-examples repository: kogito-examples env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-quarkus-examples/ + env_BUILD_MVN_OPTS: "-Dproductized" - job_name: kogito-springboot-examples repository: kogito-examples env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-springboot-examples/ + env_BUILD_MVN_OPTS: "-Dproductized" - job_name: serverless-workflow-examples repository: kogito-examples env_KOGITO_EXAMPLES_SUBFOLDER_POM: serverless-workflow-examples/ + env_BUILD_MVN_OPTS: "-Dproductized" fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.job_name }} (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}) diff --git a/.github/workflows/pr-kogito-runtimes.yml b/.github/workflows/pr-kogito-runtimes.yml index 1e0bbdb0764..613fcb9c344 100644 --- a/.github/workflows/pr-kogito-runtimes.yml +++ b/.github/workflows/pr-kogito-runtimes.yml @@ -47,6 +47,7 @@ jobs: definition-file: https://raw.githubusercontent.com/${GROUP:kiegroup}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml env: BUILD_MVN_OPTS_CURRENT: '-Dvalidate-formatting' + BUILD_MVN_OPTS: -Dproductized - name: Junit Report uses: kiegroup/kogito-pipelines/.ci/actions/action-junit-report@main if: ${{ always() }} From c9c12a2e2f5f6fa000d8489d8879afc6fa47e82e Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Tue, 6 Feb 2024 12:03:36 +0100 Subject: [PATCH 3/3] pr-downstream.yml: remove kogito-quarkus-examples and kogito-springboot-examples that are not part of the product --- .github/workflows/pr-downstream.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index cd30e8c2683..19ee4e6e70c 100644 --- a/.github/workflows/pr-downstream.yml +++ b/.github/workflows/pr-downstream.yml @@ -20,7 +20,7 @@ jobs: timeout-minutes: 180 strategy: matrix: - job_name: [ kogito-apps, kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ] + job_name: [ kogito-apps, serverless-workflow-examples ] os: [ubuntu-latest] java-version: [17] maven-version: ['3.9.6'] @@ -28,14 +28,6 @@ jobs: - job_name: kogito-apps repository: kogito-apps env_BUILD_MVN_OPTS: "-DskipUI -Dproductized" - - job_name: kogito-quarkus-examples - repository: kogito-examples - env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-quarkus-examples/ - env_BUILD_MVN_OPTS: "-Dproductized" - - job_name: kogito-springboot-examples - repository: kogito-examples - env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-springboot-examples/ - env_BUILD_MVN_OPTS: "-Dproductized" - job_name: serverless-workflow-examples repository: kogito-examples env_KOGITO_EXAMPLES_SUBFOLDER_POM: serverless-workflow-examples/