diff --git a/packages/cors-proxy-image/Containerfile b/packages/cors-proxy-image/Containerfile index 582a4f9c16b..7056604b012 100644 --- a/packages/cors-proxy-image/Containerfile +++ b/packages/cors-proxy-image/Containerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.3 +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4 ARG CORS_PROXY_DEFAULT_PORT=8080 ARG CORS_PROXY_DEFAULT_ORIGIN=* diff --git a/packages/dashbuilder-viewer-image/Containerfile b/packages/dashbuilder-viewer-image/Containerfile index 55678da2613..fcc4531b36b 100644 --- a/packages/dashbuilder-viewer-image/Containerfile +++ b/packages/dashbuilder-viewer-image/Containerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.3 +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4 RUN microdnf --disableplugin=subscription-manager -y install httpd \ && microdnf --disableplugin=subscription-manager clean all \ diff --git a/packages/dashbuilder/pom.xml b/packages/dashbuilder/pom.xml index 03ebe329489..d1680680727 100644 --- a/packages/dashbuilder/pom.xml +++ b/packages/dashbuilder/pom.xml @@ -7,15 +7,15 @@ ~ to you under the Apache License, Version 2.0 (the ~ "License"); you may not use this file except in compliance ~ with the License. You may obtain a copy of the License at - ~ + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ + ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations - ~ under the License. + ~ under the License. --> ${illegaltransitivereportonly} - org\.jboss\.errai\.marshalling\.server\.impl\.ServerMarshallingFactory.* - io\.fabric8\.kubernetes.* io\.fabric8\.openshift.* @@ -756,17 +756,17 @@ - - commons-logging:commons-log* log4j:log4j javassist:javassist org.apache.cxf:cxf-bundle-jaxrs org.jboss.weld.se:weld-se @@ -808,8 +808,8 @@ ban-duplicated-classes - none @@ -819,14 +819,14 @@ - org.xmlpull.v1.XmlPullParserException org.xmlpull.v1.XmlPullParser - org.relaxng.datatype.* - org.apache.xmlbeans.xml.stream.XMLName org.apache.xmlbeans.xml.stream.XMLInputStream @@ -838,17 +838,17 @@ org.apache.xmlbeans.xml.stream.ReferenceResolver org.apache.xmlbeans.xml.stream.XMLEvent org.apache.xmlbeans.xml.stream.Location - org.w3c.dom.ElementTraversal org.w3c.dom.UserDataHandler - org.hornetq.utils.HornetQUtilBundle_$bundle org.hornetq.utils.HornetQUtilLogger_$logger - net.jcip.annotations.* @@ -862,22 +862,22 @@ org.eclipse.aether.* org.apache.maven.* org.codehaus.plexus.* - org.infinispan.util.AbstractDelegatingConcurrentMap org.infinispan.util.AbstractDelegatingMap org.infinispan.util.AbstractDelegatingSet org.infinispan.util.AbstractDelegatingCollection - org.apache.kafka.common.message.* org.apache.sshd.common.io.* org.apache.sshd.common.auth.* - org.glassfish @@ -886,7 +886,7 @@ javax.json.* - org.glassfish @@ -895,7 +895,7 @@ javax.el.* - com.sun.activation @@ -904,7 +904,7 @@ javax.activation.* - com.sun.mail @@ -914,7 +914,7 @@ - org.jboss.errai errai-ioc @@ -923,7 +923,7 @@ - org.jboss.errai errai-javax-enterprise @@ -932,7 +932,7 @@ - io.quarkus quarkus-ide-launcher @@ -940,9 +940,9 @@ * - com.google.gwt @@ -956,14 +956,14 @@ org.elasticsearch elasticsearch - org.joda.time.base.BaseDateTime - org.kie @@ -973,7 +973,7 @@ - org.dominokit @@ -983,7 +983,7 @@ - org.antlr @@ -1000,7 +1000,7 @@ - org.kie.server @@ -1025,8 +1025,8 @@ - io.fabric8 openshift-client @@ -1304,7 +1304,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.3.0 + 1.6.0 true resolveCiFriendliesOnly @@ -1345,8 +1345,8 @@ ban-duplicated-classes - validate diff --git a/packages/dev-deployment-dmn-form-webapp-image/Containerfile b/packages/dev-deployment-dmn-form-webapp-image/Containerfile index ceab50f22e7..37771fde116 100644 --- a/packages/dev-deployment-dmn-form-webapp-image/Containerfile +++ b/packages/dev-deployment-dmn-form-webapp-image/Containerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.3 +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi-minimal:9.4 RUN microdnf --disableplugin=subscription-manager -y install httpd \ && microdnf --disableplugin=subscription-manager clean all \ diff --git a/packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml b/packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml index 20d0ea63639..e6bce3a0e1c 100644 --- a/packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml +++ b/packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml @@ -7,15 +7,15 @@ ~ to you under the Apache License, Version 2.0 (the ~ "License"); you may not use this file except in compliance ~ with the License. You may obtain a copy of the License at - ~ + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ + ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations - ~ under the License. + ~ under the License. --> 0.0.0 - 3.8.1 + 3.13.0 true - 11 - 11 + 17 + 17 UTF-8 UTF-8 - 3.0.0-M5 - 4.13.1 + 3.2.5 + 4.13.2 + true @@ -157,7 +158,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.3.0 + 1.6.0 true resolveCiFriendliesOnly diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile b/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile index 38e4a81b06b..c82a6e8e2d0 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile @@ -27,7 +27,9 @@ ENV DEV_DEPLOYMENT__UPLOAD_SERVICE_EXTRACT_TO_DIR=$HOME_PATH/app/src/main/resour ENV DEV_DEPLOYMENT__UPLOAD_SERVICE_PORT=8080 COPY --chown=$USER_ID:$USER_ID dist-dev/quarkus-app $HOME_PATH/app/ -COPY --chown=$USER_ID:$USER_ID dist-dev/quarkus-app-m2 /tmp/kogito/.m2/repository +# This copies the jbpm-quarkus-devui dependencies to the m2 repository. +# Commented out for now as it still requires docker to run. https://github.com/apache/incubator-kie-issues/issues/1272 +# COPY --chown=$USER_ID:$USER_ID dist-dev/quarkus-app-m2 /tmp/kogito/.m2/repository RUN ./mvnw clean package -B -ntp -Dmaven.test.skip -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH} \ && chgrp -R 0 $HOME_PATH/app && chmod -R g=u $HOME_PATH/app && chgrp -R 0 /tmp/kogito && chmod -R g=u /tmp/kogito && chgrp -R 0 /.m2 && chmod -R g=u /.m2 diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json index 2a90303600d..7a5600680f2 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json @@ -15,7 +15,7 @@ "scripts": { "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm copy:assets\" \"pnpm image:docker:build\"", "build:prod": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm copy:assets\" \"pnpm image:docker:build\"", - "copy:assets": "rimraf dist-dev && mkdir -p ./dist-dev && pnpm copy:m2-for-jbpm-quarkus-devui && pnpm copy:quarkus-app", + "copy:assets": "rimraf dist-dev && mkdir -p ./dist-dev && pnpm copy:quarkus-app", "copy:m2-for-jbpm-quarkus-devui": "mvn dependency:copy-dependencies -Dmdep.useRepositoryLayout=true -Dmdep.copyPom=true -DexcludeTransitive=true -DoutputDirectory=./dist-dev/quarkus-app-m2", "copy:quarkus-app": "run-script-os", "copy:quarkus-app:linux:darwin": " cp -R ./node_modules/@kie-tools/dev-deployment-kogito-quarkus-blank-app/ ./dist-dev/quarkus-app && rm -rf ./dist-dev/quarkus-app/node_modules ./dist-dev/quarkus-app/install.js ./dist-dev/quarkus-app/env ./dist-dev/quarkus-app/package.json", diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/pom.xml b/packages/dev-deployment-kogito-quarkus-blank-app-image/pom.xml index 1ac91d54290..7a114b351c5 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/pom.xml +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/pom.xml @@ -7,15 +7,15 @@ ~ to you under the Apache License, Version 2.0 (the ~ "License"); you may not use this file except in compliance ~ with the License. You may obtain a copy of the License at - ~ + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ + ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations - ~ under the License. + ~ under the License. --> ${revision} - + + org.kie kie-tools-maven-base diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/package.json b/packages/dev-deployment-kogito-quarkus-blank-app/package.json index bac09dbecbb..7e7e7c320f8 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/package.json +++ b/packages/dev-deployment-kogito-quarkus-blank-app/package.json @@ -29,9 +29,7 @@ "quarkus:dev:darwin:linux": "mvn clean package quarkus:dev -DskipTests", "quarkus:dev:win32": "mvn clean package quarkus:dev `-DskipTests" }, - "dependencies": { - "@kie-tools/jbpm-quarkus-devui": "workspace:*" - }, + "dependencies": {}, "devDependencies": { "@kie-tools/maven-config-setup-helper": "workspace:*", "@kie-tools/root-env": "workspace:*", diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml index e31665fca9e..529bcbbb56c 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml +++ b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml @@ -37,7 +37,7 @@ ${revision} - 3.12.1 + 3.13.0 true 17 17 @@ -108,6 +108,7 @@ + ${revision} - 3.12.1 + 3.13.0 false 17 UTF-8 diff --git a/packages/serverless-workflow-diagram-editor/pom.xml b/packages/serverless-workflow-diagram-editor/pom.xml index 479473fe8a8..b17171ebf2a 100644 --- a/packages/serverless-workflow-diagram-editor/pom.xml +++ b/packages/serverless-workflow-diagram-editor/pom.xml @@ -718,7 +718,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.3.0 + 1.6.0 true resolveCiFriendliesOnly diff --git a/packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml b/packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml index 9173e98f8af..17ee5c338aa 100644 --- a/packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml +++ b/packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml @@ -7,15 +7,15 @@ ~ to you under the Apache License, Version 2.0 (the ~ "License"); you may not use this file except in compliance ~ with the License. You may obtain a copy of the License at - ~ + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ + ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations - ~ under the License. + ~ under the License. --> greeting-flow 1.0 - 3.8.1 + 3.13.0 11 UTF-8 UTF-8 diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index e397a3302bb..823ef776139 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -7,15 +7,15 @@ ~ to you under the Apache License, Version 2.0 (the ~ "License"); you may not use this file except in compliance ~ with the License. You may obtain a copy of the License at - ~ + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ + ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations - ~ under the License. + ~ under the License. --> - + 4.0.0 org.kie.kogito.stunner.editors stunner-editors-parent @@ -667,7 +667,7 @@ javax.annotation javax.annotation-api - com.google.gwt @@ -866,7 +866,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.3.0 + 1.6.0 true resolveCiFriendliesOnly diff --git a/packages/yard-validator-worker/pom.xml b/packages/yard-validator-worker/pom.xml index c8af904c4e8..4fdccef3552 100644 --- a/packages/yard-validator-worker/pom.xml +++ b/packages/yard-validator-worker/pom.xml @@ -44,7 +44,7 @@ 0.4 2.0.10 - 3.8.1 + 3.13.0 11 11 0.23.0 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d3a1a23842f..e52fed96dea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3337,10 +3337,6 @@ importers: version: 1.1.6 packages/dev-deployment-kogito-quarkus-blank-app: - dependencies: - "@kie-tools/jbpm-quarkus-devui": - specifier: workspace:* - version: link:../jbpm-quarkus-devui devDependencies: "@kie-tools/maven-config-setup-helper": specifier: workspace:* diff --git a/repo/graph.dot b/repo/graph.dot index b783733f63d..efc21715fa8 100644 --- a/repo/graph.dot +++ b/repo/graph.dot @@ -88,6 +88,7 @@ digraph G { "@kie-tools/form-dmn" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/dev-deployment-dmn-form-webapp-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; + "@kie-tools/maven-config-setup-helper" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/dmn-editor" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools-core/react-hooks" [ color = "purple", fontcolor = "purple", style = "rounded" ]; @@ -134,7 +135,6 @@ digraph G { "@kie-tools/kogito-task-console" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/runtime-tools-task-console-webapp" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools-core/kubernetes-bridge" [ color = "purple", fontcolor = "purple", style = "rounded" ]; - "@kie-tools/maven-config-setup-helper" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools-core/workspace" [ color = "purple", fontcolor = "purple", style = "rounded" ]; "@kie-tools/unitables-dmn" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "pmml-vscode-extension" [ color = "blue", fontcolor = "blue", style = "rounded" ]; @@ -307,7 +307,8 @@ digraph G { "@kie-tools/dev-deployment-dmn-form-webapp" -> "@kie-tools/form-dmn" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-dmn-form-webapp-image" -> "@kie-tools/dev-deployment-dmn-form-webapp" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-dmn-form-webapp-image" -> "@kie-tools/image-builder" [ style = "dashed", color = "black" ]; - "@kie-tools/dev-deployment-kogito-quarkus-blank-app" -> "@kie-tools/jbpm-quarkus-devui" [ style = "solid", color = "black" ]; + "@kie-tools/dev-deployment-kogito-quarkus-blank-app" -> "@kie-tools/maven-config-setup-helper" [ style = "dashed", color = "black" ]; + "@kie-tools/dev-deployment-kogito-quarkus-blank-app" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" -> "@kie-tools/dev-deployment-base-image" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image" -> "@kie-tools/dev-deployment-kogito-quarkus-blank-app" [ style = "solid", color = "black" ]; "@kie-tools/dev-deployment-upload-service" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ]; diff --git a/repo/graph.json b/repo/graph.json index 044cc4be4a2..1d7d99b44f3 100644 --- a/repo/graph.json +++ b/repo/graph.json @@ -710,9 +710,10 @@ }, { "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app", - "target": "@kie-tools/jbpm-quarkus-devui", + "target": "@kie-tools/maven-config-setup-helper", "weight": 1 }, + { "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app", "target": "@kie-tools/root-env", "weight": 1 }, { "source": "@kie-tools/dev-deployment-kogito-quarkus-blank-app-image", "target": "@kie-tools/dev-deployment-base-image",