From 390ec669f2c9b5b4ecede351a5fb31c597633a06 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Tue, 28 May 2024 11:13:40 -0300 Subject: [PATCH] [SRVLOGIC-311] - Add Red Hat repository to Maven installation Signed-off-by: Ricardo Zanini --- modules/prod/kogito-maven/configure | 27 ++++++ modules/prod/kogito-maven/maven/settings.xml | 88 +++++++++++++++++++ .../kogito-maven/{3.9.x-prod => }/module.yaml | 15 +--- prod-logic-swf-builder-rhel8-image.yaml | 3 +- prod-logic-swf-devmode-rhel8-image.yaml | 3 +- 5 files changed, 121 insertions(+), 15 deletions(-) create mode 100755 modules/prod/kogito-maven/configure create mode 100644 modules/prod/kogito-maven/maven/settings.xml rename modules/prod/kogito-maven/{3.9.x-prod => }/module.yaml (68%) diff --git a/modules/prod/kogito-maven/configure b/modules/prod/kogito-maven/configure new file mode 100755 index 000000000..991618cc9 --- /dev/null +++ b/modules/prod/kogito-maven/configure @@ -0,0 +1,27 @@ +#!/bin/sh +# +# 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. +# +set -e + +SCRIPT_DIR=$(dirname "${0}") + +echo "---> Overriding Maven settings.xml file with Red Hat configuration" + +mkdir -p "${KOGITO_HOME}"/.m2 +cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2 diff --git a/modules/prod/kogito-maven/maven/settings.xml b/modules/prod/kogito-maven/maven/settings.xml new file mode 100644 index 000000000..42cfd1052 --- /dev/null +++ b/modules/prod/kogito-maven/maven/settings.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + kogito-images + + + maven-central + Maven Central Repository + https://repo.maven.apache.org/maven2/ + default + + true + never + + + false + never + + + + redhat + Red Hat GA Repository + https://maven.repository.redhat.com/ga/ + default + + true + never + + + false + never + + + + + + + + maven-central + Maven Central Repository + https://repo.maven.apache.org/maven2/ + default + + true + never + + + false + never + + + + redhat + Red Hat GA Repository + https://maven.repository.redhat.com/ga/ + default + + true + never + + + false + never + + + + + + + + + kogito-images + + diff --git a/modules/prod/kogito-maven/3.9.x-prod/module.yaml b/modules/prod/kogito-maven/module.yaml similarity index 68% rename from modules/prod/kogito-maven/3.9.x-prod/module.yaml rename to modules/prod/kogito-maven/module.yaml index 302413a52..142eaa6f3 100644 --- a/modules/prod/kogito-maven/3.9.x-prod/module.yaml +++ b/modules/prod/kogito-maven/module.yaml @@ -17,15 +17,8 @@ # under the License. # schema_version: 1 -name: org.kie.kogito.maven.prod -version: "3.9.3" - -envs: - - name: "MAVEN_VERSION" - value: "3.9.3" - -artifacts: - - name: apache-maven-3.9.3-bin.tar.gz - url: https://download.devel.redhat.com/brewroot/packages/org.apache.maven-apache-maven/3.9.3/1/maven/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.tar.gz - md5: f3fbff830d9a0dc2c6c99a76e27d0c01 +name: org.kie.kogito.maven.osl +version: "999-SNAPSHOT" +execute: + - script: configure diff --git a/prod-logic-swf-builder-rhel8-image.yaml b/prod-logic-swf-builder-rhel8-image.yaml index d72c5920c..39ef7f7d1 100644 --- a/prod-logic-swf-builder-rhel8-image.yaml +++ b/prod-logic-swf-builder-rhel8-image.yaml @@ -53,9 +53,8 @@ modules: - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.maven.prod - version: "3.9.3" - name: org.kie.kogito.maven.common + - name: org.kie.kogito.maven.osl - name: org.kie.kogito.project.versions - name: org.kie.kogito.swf.common.scripts - name: org.kie.kogito.swf.builder.runtime.osl diff --git a/prod-logic-swf-devmode-rhel8-image.yaml b/prod-logic-swf-devmode-rhel8-image.yaml index 490a5800e..1d8a2791c 100644 --- a/prod-logic-swf-devmode-rhel8-image.yaml +++ b/prod-logic-swf-devmode-rhel8-image.yaml @@ -49,9 +49,8 @@ modules: - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.maven.prod - version: "3.9.3" - name: org.kie.kogito.maven.common + - name: org.kie.kogito.maven.osl - name: org.kie.kogito.project.versions - name: org.kie.kogito.swf.common.scripts - name: org.kie.kogito.swf.devmode.runtime.common