[camel-k] 03/06: fix: maven overlay script

[pc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit cc39f583326ba1f8ec7cd964de65c2f70ceefa5f
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Mar 8 17:53:01 2023 +0100

    fix: maven overlay script
---
 script/maven_overlay.sh | 72 +++++++++++--------------------------------------
 1 file changed, 16 insertions(+), 56 deletions(-)

diff --git a/script/maven_overlay.sh b/script/maven_overlay.sh
index c8b25f571..65fa15e6b 100755
--- a/script/maven_overlay.sh
+++ b/script/maven_overlay.sh
@@ -45,49 +45,13 @@ fi
 runtime_version=$1
 output_dir=$2
 
-if [ -n "$staging_repo" ]; then
-    if  [[ $staging_repo == http:* ]] || [[ $staging_repo == https:* ]]; then
-        options="${options} -s ${rootdir}/settings.xml"
-        cat << EOF > ${rootdir}/settings.xml
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <profiles>
-    <profile>
-      <id>camel-k-staging</id>
-      <repositories>
-        <repository>
-          <id>camel-k-staging-releases</id>
-          <name>Camel K Staging</name>
-          <url>${staging_repo}</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>camel-k-staging</activeProfile>
-  </activeProfiles>
-</settings>
-EOF
-    fi
+if [ ! -z $staging_repo ]; then
+  # Change the settings to include the staging repo if it's not already there
+  echo "INFO: updating the settings staging repository"
+  sed -i "s;<url>https://repository\.apache\.org/content/repositories/orgapachecamel-.*</url>;<url>$staging_repo</url>;" $location/maven-settings.xml
 fi
 
-
-if [ -z "$local_runtime_dir" ]; then
-    mvn -q \
-      $options \
-      dependency:copy \
-      -Dartifact=org.apache.camel.k:camel-k-maven-logging:${runtime_version}:zip \
-      -DoutputDirectory=${rootdir}/${output_dir}
-
-    mv ${rootdir}/${output_dir}/camel-k-maven-logging-${runtime_version}.zip ${rootdir}/${output_dir}/camel-k-maven-logging.zip
-else
+if [ ! -z "$local_runtime_dir" ]; then
     # Take the dependencies from a local development environment
     camel_k_runtime_source_version=$(mvn -f $local_runtime_dir/pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)
 
@@ -100,20 +64,16 @@ else
       -am \
       -f $local_runtime_dir/support/camel-k-maven-logging/pom.xml \
       install
-
-    mvn -q \
-      $options \
-      dependency:copy \
-      -Dartifact=org.apache.camel.k:camel-k-maven-logging:$camel_k_runtime_source_version:zip \
-      -DoutputDirectory=${rootdir}/${output_dir}
-
-    mv ${rootdir}/${output_dir}/camel-k-maven-logging-$camel_k_runtime_source_version.zip ${rootdir}/${output_dir}/camel-k-maven-logging.zip
-fi
-
-unzip -q -o ${rootdir}/${output_dir}/camel-k-maven-logging.zip -d ${rootdir}/${output_dir}
-
-if [ -n "$staging_repo" ]; then
-    rm ${rootdir}/settings.xml
 fi
 
-rm ${rootdir}/${output_dir}/camel-k-maven-logging.zip
+mvn -q \
+  $options \
+  dependency:copy \
+  -Dartifact=org.apache.camel.k:camel-k-maven-logging:${runtime_version}:zip \
+  -D mdep.useBaseVersion=true \
+  -DoutputDirectory=${rootdir}/${output_dir} \
+  -Papache \
+  -s $location/maven-settings.xml
+
+unzip -q -o ${rootdir}/${output_dir}/camel-k-maven-logging-${runtime_version}.zip -d ${rootdir}/${output_dir}
+rm -f camel-k-maven-logging-${runtime_version}.zip