diff --git a/.ci/compilation.stages b/.ci/compilation.stages
index 7ad20852c13..19fc3f41f2b 100644
--- 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
index ce8570f151b..34b3aa5c248 100644
--- a/.ci/downstream.production.stages
+++ b/.ci/downstream.production.stages
@@ -20,4 +20,5 @@ def call(def propertiesFolderPath) {
}
}
+
return this
\ No newline at end of file
diff --git a/.ci/fullDownstream.stages b/.ci/fullDownstream.stages
index 42e2942f563..619ad2feaf8 100644
--- 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
\ No newline at end of file
diff --git a/.ci/project-dependencies.yaml b/.ci/project-dependencies.yaml
index 30bad51d99b..34c2a86c044 100644
--- 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
index 7d90980e9c9..473c3dcb218 100644
--- 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
index 98aa4a815f9..5a50f9b6b8c 100644
--- 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
index 280a30dd23e..a8c34d5db5d 100644
--- 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
index 2e6b46286cf..5fe5ca6391a 100644
--- 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
index 589b93c4ec2..590d5815008 100644
Binary files a/docs/project-dependencies-hierarchy.png and b/docs/project-dependencies-hierarchy.png differ
diff --git a/drools-bom/pom.xml b/drools-bom/pom.xml
index 8362c8e76cf..602a79eb86c 100644
--- a/drools-bom/pom.xml
+++ b/drools-bom/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/jbpm-bom/pom.xml b/jbpm-bom/pom.xml
index e0294a8d323..4b07a73e896 100644
--- a/jbpm-bom/pom.xml
+++ b/jbpm-bom/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/kie-bom/pom.xml b/kie-bom/pom.xml
index 059a64a3892..0c3440466a6 100644
--- a/kie-bom/pom.xml
+++ b/kie-bom/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
@@ -2647,102 +2647,6 @@
sources
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-api
- ${version.org.kie}
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-api
- ${version.org.kie}
- sources
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-backend
- ${version.org.kie}
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-backend
- ${version.org.kie}
- sources
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-client
- ${version.org.kie}
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-client
- ${version.org.kie}
- sources
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-project-api
- ${version.org.kie}
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-project-api
- ${version.org.kie}
- sources
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-project-client
- ${version.org.kie}
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-project-client
- ${version.org.kie}
- sources
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-project-backend
- ${version.org.kie}
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-case-mgmt-project-backend
- ${version.org.kie}
- sources
-
-
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-showcase-standalone
- ${version.org.kie}
- war
-
-
-
- org.kie.workbench.stunner
- kie-wb-common-stunner-showcase-project
- ${version.org.kie}
- war
-
-
org.kie.workbench
diff --git a/kie-build-tools/pom.xml b/kie-build-tools/pom.xml
index bbd9e1f214d..9305f1840ef 100644
--- a/kie-build-tools/pom.xml
+++ b/kie-build-tools/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/kie-dmn-bom/pom.xml b/kie-dmn-bom/pom.xml
index 98753a27c12..7c8be4f916f 100644
--- a/kie-dmn-bom/pom.xml
+++ b/kie-dmn-bom/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/kie-platform-bom/pom.xml b/kie-platform-bom/pom.xml
index 07a4f633c1f..d6f975c47f8 100644
--- a/kie-platform-bom/pom.xml
+++ b/kie-platform-bom/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/kie-pmml-bom/pom.xml b/kie-pmml-bom/pom.xml
index 586b433e2d0..7736dd005f9 100644
--- a/kie-pmml-bom/pom.xml
+++ b/kie-pmml-bom/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
@@ -107,6 +107,12 @@
kie-pmml-evaluator-assembler
${version.org.kie}
+
+
+ org.kie
+ kie-pmml-kie-internal
+ ${version.org.kie}
+
org.kie
@@ -229,6 +235,13 @@
${version.org.kie}
sources
+
+
+ org.kie
+ kie-pmml-kie-internal
+ ${version.org.kie}
+ sources
+
org.kie
diff --git a/kie-soup-bom/pom.xml b/kie-soup-bom/pom.xml
index f63881349b7..6d61773bda5 100644
--- a/kie-soup-bom/pom.xml
+++ b/kie-soup-bom/pom.xml
@@ -22,7 +22,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/kie-uberfire-extensions-bom/pom.xml b/kie-uberfire-extensions-bom/pom.xml
index 32ac63a0b89..c9b1d9fc196 100644
--- a/kie-uberfire-extensions-bom/pom.xml
+++ b/kie-uberfire-extensions-bom/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/kie-user-bom-parent/pom.xml b/kie-user-bom-parent/pom.xml
index c83c23c6923..5dc0702e93c 100644
--- a/kie-user-bom-parent/pom.xml
+++ b/kie-user-bom-parent/pom.xml
@@ -14,7 +14,7 @@
org.kie
kie-user-bom-parent
pom
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
KIE (Drools, jBPM, OptaPlanner) user BOM parent
diff --git a/narayana-integration-bom/pom.xml b/narayana-integration-bom/pom.xml
index f4be8010116..83035f075de 100644
--- a/narayana-integration-bom/pom.xml
+++ b/narayana-integration-bom/pom.xml
@@ -5,7 +5,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/optaplanner-bom/pom.xml b/optaplanner-bom/pom.xml
index bb852677632..bd78c71245c 100644
--- a/optaplanner-bom/pom.xml
+++ b/optaplanner-bom/pom.xml
@@ -6,7 +6,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml
diff --git a/pom.xml b/pom.xml
index 304769552f5..23925d7d71d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
KIE (Drools, jBPM, OptaPlanner) parent
@@ -94,7 +94,7 @@
1.27
1.0.43
2.3.0
- 1.4.14
+ 1.4.15
0.0.2
2.1.3
2.9.2
@@ -239,7 +239,7 @@
5.5.2
9.0.3
2.13.2
- 2.4.10.Final
+ 2.4.12.Final
3.0.2.Final
4.3.1
@@ -258,8 +258,8 @@
2.3.0
3.2.3
5.2.5.RELEASE
- 2.2.6.RELEASE
- 2.2.6
+ 2.3.4.RELEASE
+ 2.3.4
1.2.1
1.2
3.1.6
@@ -285,7 +285,7 @@
${version.xmlpull}
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
${version.org.kie}
${version.org.kie}
${version.org.kie}
@@ -308,7 +308,6 @@
0.11
1.4
1.0.2
- 4.11.1
4.8
3.2.14
2.24.0
@@ -3720,6 +3719,12 @@
infinispan-commons
${version.org.infinispan}
+
+ org.infinispan
+ infinispan-core
+ ${version.org.infinispan}
+
+
org.infinispan
infinispan-query-dsl
@@ -4054,6 +4059,12 @@
${version.org.jsoup}
+
+ org.keycloak
+ keycloak-admin-client
+ ${version.org.keycloak}
+ test
+
org.keycloak
keycloak-core
@@ -4386,6 +4397,12 @@
${version.org.testcontainers}
test
+
+ org.testcontainers
+ testcontainers
+ ${version.org.testcontainers}
+ test
+
org.testcontainers
toxiproxy
@@ -4619,12 +4636,6 @@
${version.javax.xml.stream.stax}
-
- link.bek.tools
- issue-keeper-junit
- ${version.link.bek.tools.issue-keeper-junit}
-
-
jakarta-regexp
@@ -5363,7 +5374,6 @@
org.kie
kie-pmml-dependencies
${version.org.kie}
- pom
diff --git a/script/release/09_createjBPM_installers.sh b/script/release/09_createjBPM_installers.sh
index c7e00db03ea..8c8f69f571d 100755
--- a/script/release/09_createjBPM_installers.sh
+++ b/script/release/09_createjBPM_installers.sh
@@ -1,6 +1,8 @@
#!/bin/bash -e
# this script build the jbpm-installer and jbpm-installer full
+# parameter droolsjbpm-tools version = $1
+toolsVer=$1
# fetch the from kie-parent-metadata pom.xml and set it on parameter KIE_VERSION
kieVersion=$(sed -e 's/^[ \t]*//' -e 's/[ \t]*$//' -n -e 's/\(.*\)<\/version.org.kie>/\1/p' droolsjbpm-build-bootstrap/pom.xml)
@@ -18,7 +20,7 @@ createJbpmInstaller(){
sed -i -e '/^#/!s/jBPM.console.url=http.*/jBPM.console.url=https:\/\/repository.jboss.org\/nexus\/content\/groups\/'$URLgroup'\/org\/kie\/business-central\/\${jBPM.version}\/business-central-\${jBPM.version}-wildfly19.war/g' jbpm-installer-$kieVersion/build.properties
sed -i -e '/^#/!s/jBPM.casemgmt.url=https.*/jBPM.casemgmt.url=https:\/\/repository.jboss.org\/nexus\/content\/groups\/'$URLgroup'\/org\/jbpm\/jbpm-wb-case-mgmt-showcase\/\${jBPM.version}\/jbpm-wb-case-mgmt-showcase-\${jBPM.version}-wildfly19.war/g' jbpm-installer-$kieVersion/build.properties
sed -i -e '/^#/!s/kie.server.url=http.*/kie.server.url=http:\/\/repository.jboss.org\/nexus\/content\/groups\/'$URLgroup'\/org\/kie\/server\/kie-server\/${jBPM.version}\/kie-server-\${jBPM.version}-ee7.war/g' jbpm-installer-$kieVersion/build.properties
- sed -i -e '/^#/!s/droolsjbpm.eclipse.version=\${snapshot.version}/droolsjbpm.eclipse.version=\${release.version}/g' jbpm-installer-$kieVersion/build.properties
+ sed -i -e '/^#/!s/droolsjbpm.eclipse.version=\${snapshot.version}/droolsjbpm.eclipse.version='$toolsVer'/g' jbpm-installer-$kieVersion/build.properties
sed -i -e '/^#/!s/droolsjbpm.eclipse.url=http.*/droolsjbpm.eclipse.url=https:\/\/repository.jboss.org\/nexus\/content\/groups\/'$URLgroup'\/org\/drools\/org.drools.updatesite\/\${droolsjbpm.eclipse.version}\/org.drools.updatesite-\${droolsjbpm.eclipse.version}.zip/g' jbpm-installer-$kieVersion/build.properties
# add modified build.properties to jbpm-installer-.zip
diff --git a/script/release/10a_drools_upload_filemgmt.sh b/script/release/10a_drools_upload_filemgmt.sh
index 61fb862f9bc..782f7e1cdc6 100755
--- a/script/release/10a_drools_upload_filemgmt.sh
+++ b/script/release/10a_drools_upload_filemgmt.sh
@@ -15,12 +15,6 @@ chmod +x upload_version
sftp -i $1 -b upload_version $droolsDocs
sftp -i $1 -b upload_version $droolsHtdocs
-#creates directories for updatesite for drools and jbpm on filemgmt.jboss.org
-touch upload_drools
-echo "mkdir org.drools.updatesite" > upload_drools
-chmod +x upload_drools
-sftp -i $1 -b upload_drools $droolsHtdocs/$kieVersion
-
#creates directoy kie-api-javadoc for drools on filemgmt.jboss.org
touch upload_kie_api_javadoc
echo "mkdir kie-api-javadoc" > upload_kie_api_javadoc
@@ -44,9 +38,6 @@ scp -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $uploadDir
scp -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $uploadDir/business-central-$kieVersion-*.war $droolsHtdocs/$kieVersion
scp -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $uploadDir/kie-server-distribution-$kieVersion.zip $droolsHtdocs/$kieVersion
-# updatesite
-scp -r -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $1 $uploadDir/updatesite/* $droolsHtdocs/$kieVersion/org.drools.updatesite
-
# docs
scp -r -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $1 $uploadDir/drools-docs/* $droolsDocs/$kieVersion/drools-docs
scp -r -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $1 $uploadDir/kie-api-javadoc/* $droolsDocs/$kieVersion/kie-api-javadoc
@@ -76,5 +67,5 @@ if [[ "${kieVersion}" == *Final* ]]; then
fi
# remove files and directories for uploading drools
-rm upload_*
+rm -rf upload_*
rm -rf filemgmt_links
diff --git a/script/release/10b_jbpm_upload_filemgmt.sh b/script/release/10b_jbpm_upload_filemgmt.sh
index 5292091baf0..9cd2948345e 100755
--- a/script/release/10b_jbpm_upload_filemgmt.sh
+++ b/script/release/10b_jbpm_upload_filemgmt.sh
@@ -15,12 +15,6 @@ chmod +x upload_version
sftp -i $1 -b upload_version $jbpmDocs
sftp -i $1 -b upload_version $jbpmHtdocs
-#creates directory updatesite for jbpm on filemgmt.jboss.org
-touch upload_jbpm
-echo "mkdir updatesite" > upload_jbpm
-chmod +x upload_jbpm
-sftp -i $1 -b upload_jbpm $jbpmHtdocs/$kieVersion
-
# creates a directory service-repository for jbpm on filemgmt.jboss.org
touch upload_service_repository
echo "mkdir service-repository" > upload_service_repository
@@ -59,9 +53,6 @@ else
uploadInstaller
fi
-# updatesite
-scp -r -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $uploadDir/updatesite/* $jbpmHtdocs/$kieVersion/updatesite
-
# docs
scp -r -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $uploadDir/jbpm-docs/* $jbpmDocs/$kieVersion/jbpm-docs
scp -r -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $uploadDir/service-repository/* $jbpmHtdocs/$kieVersion/service-repository
@@ -91,5 +82,5 @@ if [[ "${kieVersion}" == *Final* ]]; then
fi
# remove files and directories for uploading drools
-rm upload_*
+rm -rf upload_*
rm -rf filemgmt_links
\ No newline at end of file
diff --git a/script/release/10c_optaplanner_upload_filemgmt.sh b/script/release/10c_optaplanner_upload_filemgmt.sh
index 3187e03c881..22dbb5ef54d 100755
--- a/script/release/10c_optaplanner_upload_filemgmt.sh
+++ b/script/release/10c_optaplanner_upload_filemgmt.sh
@@ -61,6 +61,6 @@ scp -r -i $1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $upload
# remove files and directories for uploading optaplanner
-rm upload_*
+rm -rf upload_*
diff --git a/script/release/prepareUploadDir.sh b/script/release/prepareUploadDir.sh
index 7312011a84c..b3162b04fb4 100755
--- a/script/release/prepareUploadDir.sh
+++ b/script/release/prepareUploadDir.sh
@@ -8,12 +8,6 @@ deployDir=../community-deploy-dir
mkdir ${kieVersion}_uploadBinaries
cd ${kieVersion}_uploadBinaries
-# updatesite
-mkdir updatesite
-cp $deployDir/org/drools/org.drools.updatesite/$kieVersion/org.drools.updatesite-$kieVersion.zip updatesite/
-unzip updatesite/org.drools.updatesite-$kieVersion.zip -d updatesite/
-rm updatesite/org.drools.updatesite-$kieVersion.zip
-
# docs
mkdir drools-docs
cp $deployDir/org/drools/drools-docs/$kieVersion/drools-docs-$kieVersion.zip drools-docs/
diff --git a/script/release/update-version-all.sh b/script/release/update-version-all.sh
index 1eacb9147b8..4a4de198262 100755
--- a/script/release/update-version-all.sh
+++ b/script/release/update-version-all.sh
@@ -197,31 +197,6 @@ for repository in `cat ${scriptDir}/../repository-list.txt` ; do
returnCode=$?
sed -i "s/release.version=.*$/release.version=$newVersion/" jbpm-installer/src/main/resources/build.properties
- elif [ "$repository" == "droolsjbpm-tools" ]; then
- cd drools-eclipse
- mvn -B -s $settingsXmlFile -Dfull tycho-versions:set-version -DnewVersion=$newVersion
- returnCode=$?
- # replace the leftovers not covered by the tycho plugin (bug?)
- # SNAPSHOT and release versions need to be handled differently
- versionToUse=$newVersion
- if [[ $newVersion == *-SNAPSHOT ]]; then
- versionToUse=`sed "s/-SNAPSHOT/.qualifier/" <<< $newVersion`
- fi
- sed -i "s/source_[^\"]*/source_$versionToUse/" org.drools.updatesite/category.xml
- sed -i "s/version=\"[^\"]*\">/version=\"$versionToUse\">/" org.drools.updatesite/category.xml
- cd ..
- if [ $returnCode == 0 ]; then
- mvn -B -N -s $settingsXmlFile clean install
- mvnVersionsUpdateParent
- # workaround for http://jira.codehaus.org/browse/MVERSIONS-161
- mvn -B -N -s $settingsXmlFile clean install -DskipTests
- cd drools-eclipse
- mvnVersionsUpdateParent
- cd ..
- mvnVersionsUpdateChildModules
- returnCode=$?
- fi
-
else
mvnVersionsUpdateParentAndChildModules
returnCode=$?
diff --git a/script/repository-list.txt b/script/repository-list.txt
index 5c7bd83be74..1ef0ee30ed7 100644
--- a/script/repository-list.txt
+++ b/script/repository-list.txt
@@ -21,5 +21,4 @@ kie-wb-distributions
openshift-drools-hacep
optaweb-employee-rostering
optaweb-vehicle-routing
-droolsjbpm-tools
kie-docs
diff --git a/uberfire-bom/pom.xml b/uberfire-bom/pom.xml
index 73ed6820e1c..f240ad3d9b5 100644
--- a/uberfire-bom/pom.xml
+++ b/uberfire-bom/pom.xml
@@ -22,7 +22,7 @@
org.kie
kie-user-bom-parent
- 7.48.0-SNAPSHOT
+ 7.49.0-SNAPSHOT
../kie-user-bom-parent/pom.xml