Bxmsprod 1144 (#33)

* [JBPM-9399] Add support to jBPM and runtime/cluster environments detection * generate files flow (kiegroup#1551) * getProjectTriggering job error solved (kiegroup#1544) * getProjectTriggering job error solved * testing generate_files.yml error * kie-wb-common should not depend on kie-wb-playground (kiegroup#1550) * JBPM-9505: Drop Case Management (Tech Preview) editor (kiegroup#1541) * Update build chain files (kiegroup#1555) Co-authored-by: mareknovotny <mareknovotny@users.noreply.github.com> * Revert "kie-wb-common should not depend on kie-wb-playground (kiegroup#1550)" (kiegroup#1558) This reverts commit 789495d. * Update build chain files (kiegroup#1559) Co-authored-by: mareknovotny <mareknovotny@users.noreply.github.com> * [DROOLS-5860] Updating poms (kiegroup#1560) * [DROOLS-5860] Declaring/updating dependencies * [DROOLS-5860] Renamed module as per PR request * [DROOLS-5860] Declaring kie-pmml-dependencies version * [DROOLS-5860] Fix poms * bump mvel to version 2.4.11.Final (kiegroup#1561) * upgraded to 7.49.0-SNAPSHOT * Bump version.com.thoughtworks.xstream from 1.4.14 to 1.4.15 (kiegroup#1562) Bumps `version.com.thoughtworks.xstream` from 1.4.14 to 1.4.15. Updates `xstream` from 1.4.14 to 1.4.15 - [Release notes](https://github.com/x-stream/xstream/releases) - [Commits](https://github.com/x-stream/xstream/commits) Updates `xstream-hibernate` from 1.4.14 to 1.4.15 - [Release notes](https://github.com/x-stream/xstream/releases) - [Commits](https://github.com/x-stream/xstream/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * JBPM-9542: Remove issue-keeper tool (kiegroup#1563) Due to recent jira authentication changes we decided to stop using issue-keeper tool for preventing test method run. It was replaced by simple '@ignore' junit annotations. For more details see: - https://issues.redhat.com/browse/JBPM-9542 - https://github.com/ibek/issue-keeper * Fixing broken upstream repository deps for kie-wb-common (kiegroup#1568) * Update build chain files (kiegroup#1569) Co-authored-by: Ginxo <Ginxo@users.noreply.github.com> * fixed removal commands in shell scripts (kiegroup#1571) * upgrade to mvel 2.4.12.Final (kiegroup#1570) * [JBPM-9557] Enable sb keycloak test with testcontainers (kiegroup#1567) * Jenkinsfile.buildchain tools replaced by nodejs (kiegroup#1572) * [ISSUE 126] --skipParallelCheckout added to Jenkinsfile.builchain (kiegroup#1574) * BXMSPROD-1124: changed upload scripts of binaries to filemgmt.jboss.org to exclude droolsjbpm-tools" (kiegroup#1556) * [JBPM-9549] Upgrade SpringBoot to 2.3.4 (kiegroup#1565) * Update project-dependencies.yaml (kiegroup#1573) Removal of droolsjbpm-tools repository from community build * Update build chain files (kiegroup#1575) Co-authored-by: mbiarnes <mbiarnes@users.noreply.github.com> * BXMSPROD-1144 test 1 * BXMSPROD-1144 test 2 Co-authored-by: egonzale <egonzale@redhat.com> Co-authored-by: Kirill Gaevskii <kgaevski@redhat.com> Co-authored-by: Roger Martínez <roger600@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: mareknovotny <mareknovotny@users.noreply.github.com> Co-authored-by: Marek Novotný <hotmana76@gmail.com> Co-authored-by: Gabriele Cardosi <gabriele.cardosi@gmail.com> Co-authored-by: Mario Fusco <mario.fusco@gmail.com> Co-authored-by: Michael Biarnes Kiefer <mbiarnes@redhat.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jozef Marko <jomarko@redhat.com> Co-authored-by: Ginxo <Ginxo@users.noreply.github.com> Co-authored-by: Gonzalo Muñoz <gmunozfe@redhat.com> Co-authored-by: mbiarnes <mbiarnes@users.noreply.github.com>
Ginxo · Jan 26, 2021 · cb3f1bb · cb3f1bb
1 parent 12f8b82
commit cb3f1bb
Show file tree

Hide file tree

Showing 30 changed files with 67 additions and 200 deletions.
diff --git a/.ci/compilation.stages b/.ci/compilation.stages
@@ -8,8 +8,7 @@ def call(def propertiesFolderPath) {
             def file = readFile REPOSITORY_LIST_FILE
             def projectCollection = file.readLines()
             projectCollection.removeAll(['kie-jpmml-integration','kie-docs'])
-            def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
-            def project = util.getProjectGroupName(util.getProject(gitURL))[1]
+            def project = util.getProjectTriggeringJob()[1]
             compile.build(projectCollection, project, "${SETTINGS_XML_ID}", "${PROPERTIES_FILE_PATH}")
         }
     }

diff --git a/.ci/downstream.production.stages b/.ci/downstream.production.stages
@@ -20,4 +20,5 @@ def call(def propertiesFolderPath) {
     }
 }
 
+
 return this
diff --git a/.ci/fullDownstream.stages b/.ci/fullDownstream.stages
@@ -7,12 +7,12 @@ def call(def propertiesFolderPath) {
             println "Reading file ${REPOSITORY_LIST_FILE}"
             def file = readFile REPOSITORY_LIST_FILE
             def projectCollection = file.readLines()
-            def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
-            def project = util.getProjectGroupName(util.getProject(gitURL))[1]
+            def project = util.getProjectTriggeringJob()[1]
             projectCollection.removeAll(['droolsjbpm-tools', 'kie-docs'])
             compile.build(projectCollection, project, "${SETTINGS_XML_ID}", "${PROPERTIES_FILE_PATH}")
         }
     }
 }
 
+
 return this
diff --git a/.ci/project-dependencies.yaml b/.ci/project-dependencies.yaml
@@ -74,6 +74,9 @@ dependencies:
   - project: kiegroup/kie-wb-common
     dependencies:
       - project: kiegroup/lienzo-core
+      - project: kiegroup/appformer
+      - project: kiegroup/kie-uberfire-extensions
+      - project: kiegroup/kie-wb-playground
       - project: kiegroup/droolsjbpm-integration
 
   - project: kiegroup/drools-wb
@@ -141,13 +144,3 @@ dependencies:
   - project: kiegroup/kie-wb-distributions
     dependencies:
       - project: kiegroup/optaplanner
-      - project: kiegroup/jbpm-wb
-      - project: kiegroup/kie-uberfire-extensions
-      - project: kiegroup/optaplanner-wb
-
-  - project: kiegroup/droolsjbpm-tools
-    dependencies:
-      - project: kiegroup/droolsjbpm-build-bootstrap
-      - project: kiegroup/jbpm
-      - project: kiegroup/drools
-      - project: kiegroup/kie-soup
diff --git a/.ci/pullrequest.stages b/.ci/pullrequest.stages
@@ -7,8 +7,7 @@ def call(def propertiesFolderPath) {
             println "Reading file ${REPOSITORY_LIST_FILE}"
             def file = readFile REPOSITORY_LIST_FILE
             def projectCollection = file.readLines()
-            def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
-            def project = util.getProjectGroupName(util.getProject(gitURL))[1]
+            def project = util.getProjectTriggeringJob()[1]
             if (project != "kie-docs") {
                 pullrequest.build(projectCollection, project, "${SETTINGS_XML_ID}", "${PROPERTIES_FILE_PATH}", "")
             } else {

diff --git a/.ci/upstream.stages b/.ci/upstream.stages
@@ -7,8 +7,7 @@ def call(def propertiesFolderPath) {
             def file = readFile REPOSITORY_LIST_FILE
             def projectCollection = file.readLines()
             projectCollection.removeAll(['kie-jpmml-integration'])
-            def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
-            def project = util.getProjectGroupName(util.getProject(gitURL))[1]
+            def project = util.getProjectTriggeringJob()[1]
 
             treebuild.upstreamBuild(projectCollection, project, "${SETTINGS_XML_ID}", 'clean install -DskipTests -Dgwt.compiler.skip=true -Dgwt.skipCompilation=true -Denforcer.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true')
         }

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -70,7 +70,6 @@ pipeline {
             steps {
                 script {
                     if(isPR()) {
-                        def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
                         def project = util.getProjectTriggeringJob()[1]
                         if(["optaplanner", "drools", "appformer", "jbpm", "drools-wb", "kie-soup", "droolsjbpm-integration", "kie-wb-common", "openshift-drools-hacep", "optaweb-employee-rostering", "optaweb-vehicle-routing"].contains(project))
                         {

diff --git a/Jenkinsfile.buildchain b/Jenkinsfile.buildchain
@@ -13,8 +13,7 @@ pipeline {
         label agentLabel
     }
     tools {
-        maven 'kie-maven-3.6.3'
-        jdk 'kie-jdk1.8'
+        nodejs 'nodejs-12.16.3'
     }
     options {
         timestamps ()
@@ -49,7 +48,7 @@ pipeline {
 
                     configFileProvider([configFile(fileId: SETTINGS_XML_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
                         withCredentials([string(credentialsId: 'kie-ci1-token', variable: 'GITHUB_TOKEN')]) {
-                            sh "build-chain-action -token=${GITHUB_TOKEN} -df='https://raw.githubusercontent.com/\${GROUP}/droolsjbpm-build-bootstrap/\${BRANCH}/.ci/${buildChainActionInfo.file}' build ${buildChainActionInfo.action} -url=${env.ghprbPullLink} -cct '(^mvn .*)||\$1 -s ${MAVEN_SETTINGS_FILE} -Dmaven.wagon.http.ssl.insecure=true'"
+                            sh "build-chain-action -token=${GITHUB_TOKEN} -df='https://raw.githubusercontent.com/\${GROUP}/droolsjbpm-build-bootstrap/\${BRANCH}/.ci/${buildChainActionInfo.file}' build ${buildChainActionInfo.action} -url=${env.ghprbPullLink} --skipParallelCheckout -cct '(^mvn .*)||\$1 -s ${MAVEN_SETTINGS_FILE} -Dmaven.wagon.http.ssl.insecure=true'"
                         }
                     }
                 }
@@ -62,7 +61,6 @@ pipeline {
             steps {
                 script {
                     if(isPR()) {
-                        def gitURL = env.ghprbAuthorRepoGitUrl ?: env.GIT_URL
                         def project = util.getProjectTriggeringJob()[1]
                         if(["optaplanner", "drools", "appformer", "jbpm", "drools-wb", "kie-soup", "droolsjbpm-integration", "kie-wb-common", "openshift-drools-hacep", "optaweb-employee-rostering", "optaweb-vehicle-routing"].contains(project))
                         {

diff --git a/docs/project-dependencies-hierarchy.png b/docs/project-dependencies-hierarchy.png
diff --git a/drools-bom/pom.xml b/drools-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/jbpm-bom/pom.xml b/jbpm-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/kie-bom/pom.xml b/kie-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 
@@ -2647,102 +2647,6 @@
         <classifier>sources</classifier>
       </dependency>
 
-      <!-- Stunner - Case Management -->
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-api</artifactId>
-        <version>${version.org.kie}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-api</artifactId>
-        <version>${version.org.kie}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-backend</artifactId>
-        <version>${version.org.kie}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-backend</artifactId>
-        <version>${version.org.kie}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-client</artifactId>
-        <version>${version.org.kie}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-client</artifactId>
-        <version>${version.org.kie}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-project-api</artifactId>
-        <version>${version.org.kie}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-project-api</artifactId>
-        <version>${version.org.kie}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-project-client</artifactId>
-        <version>${version.org.kie}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-project-client</artifactId>
-        <version>${version.org.kie}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-project-backend</artifactId>
-        <version>${version.org.kie}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-case-mgmt-project-backend</artifactId>
-        <version>${version.org.kie}</version>
-        <classifier>sources</classifier>
-      </dependency>
-
-      <!-- Stunner Showcases.-->
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-showcase-standalone</artifactId>
-        <version>${version.org.kie}</version>
-        <type>war</type>
-      </dependency>
-
-      <dependency>
-        <groupId>org.kie.workbench.stunner</groupId>
-        <artifactId>kie-wb-common-stunner-showcase-project</artifactId>
-        <version>${version.org.kie}</version>
-        <type>war</type>
-      </dependency>
-
       <!-- Stunner - DMN Editor -->
       <dependency>
         <groupId>org.kie.workbench</groupId>

diff --git a/kie-build-tools/pom.xml b/kie-build-tools/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/kie-dmn-bom/pom.xml b/kie-dmn-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/kie-platform-bom/pom.xml b/kie-platform-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/kie-pmml-bom/pom.xml b/kie-pmml-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 
@@ -107,6 +107,12 @@
         <artifactId>kie-pmml-evaluator-assembler</artifactId>
         <version>${version.org.kie}</version>
       </dependency>
+      <!-- Kie dep -->
+      <dependency>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-pmml-kie-internal</artifactId>
+        <version>${version.org.kie}</version>
+      </dependency>
       <!-- Drools -->
       <dependency>
         <groupId>org.kie</groupId>
@@ -229,6 +235,13 @@
         <version>${version.org.kie}</version>
         <classifier>sources</classifier>
       </dependency>
+      <!-- Kie dep -->
+      <dependency>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-pmml-kie-internal</artifactId>
+        <version>${version.org.kie}</version>
+        <classifier>sources</classifier>
+      </dependency>
       <!-- Drools -->
       <dependency>
         <groupId>org.kie</groupId>

diff --git a/kie-soup-bom/pom.xml b/kie-soup-bom/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/kie-uberfire-extensions-bom/pom.xml b/kie-uberfire-extensions-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/kie-user-bom-parent/pom.xml b/kie-user-bom-parent/pom.xml
@@ -14,7 +14,7 @@
   <groupId>org.kie</groupId>
   <artifactId>kie-user-bom-parent</artifactId>
   <packaging>pom</packaging>
-  <version>7.48.0-SNAPSHOT</version>
+  <version>7.49.0-SNAPSHOT</version>
 
   <name>KIE (Drools, jBPM, OptaPlanner) user BOM parent</name>
   <description>

diff --git a/narayana-integration-bom/pom.xml b/narayana-integration-bom/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/optaplanner-bom/pom.xml b/optaplanner-bom/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.kie</groupId>
     <artifactId>kie-user-bom-parent</artifactId>
-    <version>7.48.0-SNAPSHOT</version>
+    <version>7.49.0-SNAPSHOT</version>
     <relativePath>../kie-user-bom-parent/pom.xml</relativePath>
   </parent>