Sync main branch with Apache main branch

.github/pull_request_template.md

@@ -18,9 +18,6 @@ How to retest this PR or trigger a specific build:
 
 - <b>(Re)run Jenkins tests</b>  
   Please add comment: <b>Jenkins [test|retest] this</b>
-
-- <b>Prod tests</b>  
-  Please add comment: <b>Jenkins (re)run [prod|Prod|PROD]</b>
 </details>
 
 <details>

.github/workflows/kogito-images-pr-check.yml

@@ -44,9 +44,6 @@ jobs:
       - name: validate kogito imagestream
         run: |
           ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
-      - name: validate logic imagestream
-        run: |
-          ${HOME}/openshift-template-validator-linux-amd64 validate -f logic-imagestream.yaml
 
   shellcheck:
     concurrency:

Makefile

@@ -55,26 +55,6 @@ ifneq ($(ignore_test),true)
 	tests/shell/run.sh ${image_name} "quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}"
 endif
 
-# Build all images
-.PHONY: build-prod
-# start to build the images
-build-prod:
-	@for iname in $(shell make list arg=--prod); do make build-prod-image image_name=$${iname}; done
-
-
-.PHONY: build-prod-image
-image_name=
-build-prod-image: clone-repos _build-prod-image
-
-_build-prod-image:
-ifneq ($(ignore_build),true)
-	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
-	scripts/build-product-image.sh "build" $(image_name) ${build_options} ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	scripts/build-product-image.sh "test" $(image_name) ${test_options}
-endif
 
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
@@ -116,9 +96,3 @@ push-local-registry:
 .PHONY: bats
 bats:
 	./scripts/run-bats.sh
-
-.PHONY: container-build-osbs
-prod_component=
-container-build-osbs:
-	echo "calling RHPAM container-build-osbs......................................"
-	$(CEKIT_CMD) --descriptor $(prod_component).yaml --redhat build ${build_options} osbs --assume-yes ${osbs_options}

container.yaml

@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# 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.
+#
 ---
 platforms:
   only:

content_sets.yaml

@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# 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.
+#
 # This is a file defining which content sets (yum repositories) are needed to
 # update content in this image. Data provided here helps determine which images
 # are vulnerable to specific CVEs. Generally you should only need to update this

contrib/jobs-service/container-compose-postgresql.yaml

@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# 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.
+#
 services:
   postgres:
     image: postgres:13.4-alpine3.14

kogito-base-builder-image.yaml

@@ -1,7 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-base-builder"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
 
@@ -13,9 +31,9 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.10.Final"
+    value: "3.2.9.Final"
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <[email protected]>"
   - name: "io.k8s.description"
@@ -37,10 +55,11 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.openjdk
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
-      version: "3.8.6"
+      version: "3.9.3"
+    - name: org.kie.kogito.maven.common
     - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.security.custom.truststores
 

kogito-data-index-ephemeral-image.yaml

@@ -1,13 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-ephemeral"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <[email protected]>"
   - name: "io.k8s.description"
@@ -38,7 +56,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.community.ephemeral