Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NO-ISSUE: Update base images and maven plugins #2376

Merged
merged 4 commits into from
May 28, 2024
Merged

NO-ISSUE: Update base images and maven plugins #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cb2de5
NO-ISSUE: Update base images and maven plugins
thiagoelg May 27, 2024
436ee9d
Fix kn-plugin test
thiagoelg May 27, 2024
3a66189
Add comments referencing the 1272 issue
thiagoelg May 27, 2024
1a423c5
Merge branch 'fix-dep-vuln' of github.com:thiagoelg/kie-tools into fi…
thiagoelg May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cors-proxy-image/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=*
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder-viewer-image/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
96 changes: 48 additions & 48 deletions packages/dashbuilder/pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/dev-deployment-dmn-form-webapp-image/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
19 changes: 10 additions & 9 deletions packages/dev-deployment-dmn-form-webapp/dev-webapp/quarkus-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
Expand All @@ -28,14 +28,15 @@
<version>0.0.0</version>

<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<version.junit>4.13.1</version.junit>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
<version.junit>4.13.2</version.junit>
<quarkus.analytics.disabled>true</quarkus.analytics.disabled>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -157,7 +158,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.6.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
Expand Down
4 changes: 3 additions & 1 deletion packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-deployment-kogito-quarkus-blank-app-image/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions packages/dev-deployment-kogito-quarkus-blank-app-image/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
Expand All @@ -28,7 +28,7 @@
<version>${revision}</version>

<dependencies>
<dependency>
<!-- <dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-quarkus-devui-deployment</artifactId>
<version>${project.version}</version>
Expand All @@ -37,13 +37,13 @@
<groupId>org.jbpm</groupId>
<artifactId>jbpm-quarkus-devui</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
</dependency> -->
<!-- <dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-quarkus-devui-parent</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
</dependency> -->
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-tools-maven-base</artifactId>
Expand Down
4 changes: 1 addition & 3 deletions packages/dev-deployment-kogito-quarkus-blank-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand Down
5 changes: 3 additions & 2 deletions packages/dev-deployment-kogito-quarkus-blank-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<version>${revision}</version>

<properties>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
Expand Down Expand Up @@ -108,6 +108,7 @@
</exclusions>
</dependency>
<!-- This still requires docker to run. Uncomment when solved. -->
<!-- https://github.com/apache/incubator-kie-issues/issues/1272 -->
<!-- <dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-quarkus-devui</artifactId>
Expand Down Expand Up @@ -171,7 +172,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.6.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-deployment-upload-service/dev/Containerfile.ddus-buildtime-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4

ARG DDUS_FILESERVER_IP=""
ARG DDUS_VERSION="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-deployment-upload-service/dev/Containerfile.ddus-fileserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 DDUS_VERSION="0.0.0"

Expand Down
2 changes: 1 addition & 1 deletion packages/dev-deployment-upload-service/dev/Containerfile.ddus-runtime-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4

ENV DDUS_FILESERVER_IP=""
ENV DDUS_VERSION="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/kie-sandbox-webapp-image/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 KIE_SANDBOX_DEFAULT_PORT=8080

Expand Down
2 changes: 1 addition & 1 deletion ...ages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>getting-started</artifactId>
<version>1.0.0-SNAPSHOT</version>
<properties>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
2 changes: 1 addition & 1 deletion packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-input.xml_no_auto_formatting
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<artifactId>getting-started</artifactId>
<version>1.0.0-SNAPSHOT</version>
<properties>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
2 changes: 1 addition & 1 deletion packages/kogito-management-console/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 KOGITO_MANAGEMENT_CONSOLE_PORT=8080

Expand Down
2 changes: 1 addition & 1 deletion packages/kogito-task-console/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 KOGITO_TASK_CONSOLE_PORT=8080

Expand Down
4 changes: 2 additions & 2 deletions packages/maven-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
<maven.compiler.parameters>true</maven.compiler.parameters>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<version.resources.plugin>3.2.0</version.resources.plugin>
<version.flatten.plugin>1.3.0</version.flatten.plugin>
<version.flatten.plugin>1.6.0</version.flatten.plugin>
<version.junit>4.13.2</version.junit>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
<quarkus.platform.version>3.8.4</quarkus.platform.version>
Expand Down
8 changes: 4 additions & 4 deletions packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
Expand All @@ -37,7 +37,7 @@
<version>${revision}</version>

<properties>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion packages/serverless-workflow-diagram-editor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.6.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
Expand Down
8 changes: 4 additions & 4 deletions packages/serverless-workflow-vscode-extension/e2e-tests/resources/greeting-flow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
Expand All @@ -27,7 +27,7 @@
<artifactId>greeting-flow</artifactId>
<version>1.0</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
12 changes: 6 additions & 6 deletions packages/stunner-editors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
Expand All @@ -24,7 +24,7 @@
>
<!-- Purposefully not declaring maven-base as parent -->
<!-- As this package is not intended to be published. -->

<modelVersion>4.0.0</modelVersion>
<groupId>org.kie.kogito.stunner.editors</groupId>
<artifactId>stunner-editors-parent</artifactId>
Expand Down Expand Up @@ -667,7 +667,7 @@
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
<!-- Excluding old com.google.gwt 2.8.0 gwt-user and gwt-dev assets
<!-- Excluding old com.google.gwt 2.8.0 gwt-user and gwt-dev assets
that collides with newer org.gwtproject assets in gwt 2.10+ versions -->
<exclusion>
<groupId>com.google.gwt</groupId>
Expand Down Expand Up @@ -866,7 +866,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.6.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
Expand Down
2 changes: 1 addition & 1 deletion packages/yard-validator-worker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<properties>
<yaml.mapper>0.4</yaml.mapper>
<org.jresearch.gwt.time>2.0.10</org.jresearch.gwt.time>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<j2cl.maven.plugin.version>0.23.0</j2cl.maven.plugin.version>
Expand Down
4 changes: 0 additions & 4 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading