From 7135112a9ae081795e27e97422b266a4be5e870d Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Mon, 9 Sep 2024 12:16:46 -0400 Subject: [PATCH 1/3] remove modules that are not part of the product --- .../integration-tests-data-index-service/pom.xml | 3 --- .../integration-tests-jobs-service-quarkus/pom.xml | 1 - .../integration-tests-jobs-service/pom.xml | 1 - apps-integration-tests/pom.xml | 1 - data-index/data-index-service/pom.xml | 2 -- data-index/data-index-storage/pom.xml | 4 ---- .../pom.xml | 1 - .../kogito-addons-quarkus-data-index-persistence/pom.xml | 3 --- .../kogito-addons-quarkus-data-index-inmemory/pom.xml | 1 - .../kogito-addons-quarkus-data-index-postgresql/pom.xml | 1 - data-index/kogito-addons-quarkus-data-index/pom.xml | 3 --- jobs-service/pom.xml | 2 -- persistence-commons/pom.xml | 4 ---- pom.xml | 7 ------- 14 files changed, 34 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/pom.xml b/apps-integration-tests/integration-tests-data-index-service/pom.xml index e195e5d937..0e91718e14 100644 --- a/apps-integration-tests/integration-tests-data-index-service/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/pom.xml @@ -35,9 +35,6 @@ integration-tests-data-index-service-quarkus-devservice - integration-tests-data-index-service-common - integration-tests-data-index-service-quarkus - integration-tests-data-index-service-springboot diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/pom.xml index efa0934c24..724d915f42 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/pom.xml @@ -38,7 +38,6 @@ integration-tests-jobs-service-common-quarkus integration-tests-jobs-service-quarkus-management - integration-tests-jobs-service-quarkus-messaging integration-tests-jobs-service-quarkus-knative-eventing integration-tests-jobs-service-quarkus-embedded diff --git a/apps-integration-tests/integration-tests-jobs-service/pom.xml b/apps-integration-tests/integration-tests-jobs-service/pom.xml index fe4f828d70..2b97b31fd7 100644 --- a/apps-integration-tests/integration-tests-jobs-service/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/pom.xml @@ -37,7 +37,6 @@ integration-tests-jobs-service-common integration-tests-jobs-service-quarkus - integration-tests-jobs-service-springboot diff --git a/apps-integration-tests/pom.xml b/apps-integration-tests/pom.xml index 580669774d..47ab3776d2 100644 --- a/apps-integration-tests/pom.xml +++ b/apps-integration-tests/pom.xml @@ -37,7 +37,6 @@ integration-tests-data-index-service integration-tests-jobs-service - integration-tests-trusty-service diff --git a/data-index/data-index-service/pom.xml b/data-index/data-index-service/pom.xml index 6e0d8f0466..951ab53c5e 100644 --- a/data-index/data-index-service/pom.xml +++ b/data-index/data-index-service/pom.xml @@ -35,8 +35,6 @@ data-index-service-common data-index-service-inmemory data-index-service-postgresql - data-index-service-infinispan - data-index-service-mongodb diff --git a/data-index/data-index-storage/pom.xml b/data-index/data-index-storage/pom.xml index b3a5fb35ca..0fb0b9c7f0 100644 --- a/data-index/data-index-storage/pom.xml +++ b/data-index/data-index-storage/pom.xml @@ -37,10 +37,6 @@ data-index-storage-protobuf data-index-storage-postgresql data-index-storage-jpa-common - data-index-storage-common - data-index-storage-infinispan - data-index-storage-mongodb - data-index-storage-postgresql-reporting data-index-storage-jpa \ No newline at end of file diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml index 6448b222f7..c00a0badc1 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml @@ -40,7 +40,6 @@ deployment runtime integration-tests-sw - integration-tests-process diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml index 424e2d4768..870a316d06 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml @@ -36,9 +36,6 @@ kogito-addons-quarkus-data-index-persistence-common kogito-addons-quarkus-data-index-persistence-postgresql - kogito-addons-quarkus-data-index-persistence-jpa - kogito-addons-quarkus-data-index-persistence-infinispan - kogito-addons-quarkus-data-index-persistence-mongodb diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml index 92adbf7554..799e1305cc 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml @@ -40,7 +40,6 @@ deployment runtime integration-tests-sw - integration-tests-process diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml index 383c229037..f328df103d 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml @@ -40,7 +40,6 @@ deployment runtime integration-tests-sw - integration-tests-process diff --git a/data-index/kogito-addons-quarkus-data-index/pom.xml b/data-index/kogito-addons-quarkus-data-index/pom.xml index 82472e0190..9703718bdc 100644 --- a/data-index/kogito-addons-quarkus-data-index/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/pom.xml @@ -37,9 +37,6 @@ kogito-addons-quarkus-data-index-common kogito-addons-quarkus-data-index-inmemory kogito-addons-quarkus-data-index-postgresql - kogito-addons-quarkus-data-index-infinispan - kogito-addons-quarkus-data-index-mongodb - kogito-addons-quarkus-data-index-jpa diff --git a/jobs-service/pom.xml b/jobs-service/pom.xml index 40475e5365..17daf82dee 100644 --- a/jobs-service/pom.xml +++ b/jobs-service/pom.xml @@ -45,8 +45,6 @@ kogito-addons-jobs-service jobs-service-messaging-kafka jobs-service-messaging-http - jobs-service-infinispan - jobs-service-mongodb diff --git a/persistence-commons/pom.xml b/persistence-commons/pom.xml index 98a47248f5..a4ade9941c 100644 --- a/persistence-commons/pom.xml +++ b/persistence-commons/pom.xml @@ -40,10 +40,6 @@ persistence-commons-jpa-base persistence-commons-jpa persistence-commons-postgresql - persistence-commons-infinispan - persistence-commons-mongodb - persistence-commons-redis - persistence-commons-reporting-parent kogito-ddl diff --git a/pom.xml b/pom.xml index 10552f91f0..541d9f51bb 100644 --- a/pom.xml +++ b/pom.xml @@ -126,11 +126,6 @@ persistence-commons jobs-service data-index - data-audit - security-commons - explainability - trusty - jitexecutor apps-integration-tests @@ -145,8 +140,6 @@ kogito-apps-bom kogito-apps-build-parent - explainability - trusty From 951838a53479a5d88090078587c88d962b78950a Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 8 Feb 2024 08:28:57 +0100 Subject: [PATCH 2/3] pr-downstream.yml: remove kogito-quarkus-examples and kogito-springboot-examples that are not part of the product --- .github/workflows/pr-downstream.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index c835156a22..abfc34843e 100644 --- a/.github/workflows/pr-downstream.yml +++ b/.github/workflows/pr-downstream.yml @@ -20,17 +20,11 @@ jobs: timeout-minutes: 180 strategy: matrix: - job_name: [ kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ] + job_name: [ serverless-workflow-examples ] os: [ubuntu-latest] java-version: [17] maven-version: ['3.9.6'] include: - - job_name: kogito-quarkus-examples - repository: kogito-examples - env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-quarkus-examples/ - - job_name: kogito-springboot-examples - repository: kogito-examples - env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-springboot-examples/ - job_name: serverless-workflow-examples repository: kogito-examples env_KOGITO_EXAMPLES_SUBFOLDER_POM: serverless-workflow-examples/ From 496927439a171b25b509abb6dde5234e4c5bbd57 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 8 Feb 2024 08:31:11 +0100 Subject: [PATCH 3/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 | 2 ++ .github/workflows/pr-kogito-apps.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index abfc34843e..eacc09e3ad 100644 --- a/.github/workflows/pr-downstream.yml +++ b/.github/workflows/pr-downstream.yml @@ -28,6 +28,7 @@ jobs: - 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 }}) @@ -52,6 +53,7 @@ jobs: starting-project: kiegroup/${{ matrix.repository }} github-token: "${{ secrets.GITHUB_TOKEN }}" env: + BUILD_MVN_OPTS: ${{ matrix.env_BUILD_MVN_OPTS }} KOGITO_EXAMPLES_SUBFOLDER_POM: ${{ matrix.env_KOGITO_EXAMPLES_SUBFOLDER_POM }} - name: Surefire Report uses: kiegroup/kie-ci/.ci/actions/surefire-report@main diff --git a/.github/workflows/pr-kogito-apps.yml b/.github/workflows/pr-kogito-apps.yml index 96fb191fe9..6baf0f052b 100644 --- a/.github/workflows/pr-kogito-apps.yml +++ b/.github/workflows/pr-kogito-apps.yml @@ -43,6 +43,7 @@ jobs: uses: kiegroup/kie-ci/.ci/actions/build-chain@main env: NODE_OPTIONS: "--max_old_space_size=4096" + BUILD_MVN_OPTS: "-Dproductized" with: definition-file: https://raw.githubusercontent.com/${GROUP:kiegroup}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{ matrix.maven-version }}