Fix CAMEL_VERSION and QUARKUS_VERSION logic

Author: llowinge

product/README.adoc

@@ -136,24 +136,19 @@ Basic usage:
 
 [source,shell]
 ----
-export MRRC_LOCAL="/Users/<username>/Downloads/rh-quarkus-platform-3.33.2.SP1-maven-repository/maven-repository" # path to unzipped MRRC ZIP
+export MRRC_LOCAL_REPO="/Users/<username>/Downloads/rh-quarkus-platform-3.33.2.SP1-maven-repository/maven-repository" # path to unzipped MRRC ZIP
 
 export QUARKUS_PLATFORM_VERSION="3.33.2.SP1-redhat-00001"
-export CAMEL_QUARKUS_VERSION="3.33.0.redhat-00008"
-export QUARKUS_VERSION="3.33.2.redhat-00004"
-export CAMEL_VERSION="4.18.1.redhat-00026"
 
 "./camel-quarkus-testing.sh" \
       --camel-quarkus-dir ".." \
-      --mrrc-local "${MRRC_LOCAL}" \
+      --mrrc-local "${MRRC_LOCAL_REPO}" \
       --quarkus-platform-group-id com.redhat.quarkus.platform \
       --quarkus-platform-artifact-id quarkus-bom \
       --quarkus-platform-version "${QUARKUS_PLATFORM_VERSION}" \
       --camel-quarkus-platform-group-id com.redhat.quarkus.platform \
       --camel-quarkus-platform-artifact-id quarkus-camel-bom \
       --camel-quarkus-platform-version "${QUARKUS_PLATFORM_VERSION}" \
-      --quarkus-version "${QUARKUS_VERSION}" \
-      --camel-version "${CAMEL_VERSION}" \
       --run-against-mrrc-only \
       --test-modules "integration-tests/docling" \
       --verbose

product/camel-quarkus-testing.sh

@@ -255,18 +255,41 @@ log "CAMEL_QUARKUS_PLATFORM_ARTIFACT_ID = $CAMEL_QUARKUS_PLATFORM_ARTIFACT_ID"
 CAMEL_QUARKUS_PLATFORM_VERSION="${CAMEL_QUARKUS_PLATFORM_VERSION:-$QUARKUS_PLATFORM_VERSION}"
 log "CAMEL_QUARKUS_PLATFORM_VERSION = $CAMEL_QUARKUS_PLATFORM_VERSION"
 
-if [[ -z "$QUARKUS_VERSION" && -n "$MRRC_LOCAL" ]]; then
+if [[ -z "$QUARKUS_VERSION" && -n "$MRRC_LOCAL" && "$RUN_AGAINST_MRRC_ONLY" == "true" ]]; then
   QUARKUS_VERSION="$(ls "${MRRC_LOCAL}/io/quarkus/quarkus-core/" 2>/dev/null | head -1)"
   log "QUARKUS_VERSION derived from MRRC_LOCAL"
 fi
 log "QUARKUS_VERSION = $QUARKUS_VERSION"
 
-if [[ -z "$CAMEL_VERSION" && -n "$MRRC_LOCAL" ]]; then
+# Validate that QUARKUS_VERSION is set when RUN_AGAINST_MRRC_ONLY is enabled
+if [[ "$RUN_AGAINST_MRRC_ONLY" == "true" && -z "$QUARKUS_VERSION" ]]; then
+  echo "Error: When --run-against-mrrc-only is set, QUARKUS_VERSION must be specified either via:"
+  echo "  1. --quarkus-version parameter, or"
+  echo "  2. --mrrc-local (QUARKUS_VERSION will be derived from MRRC)"
+  exit 1
+fi
+
+# Validate that CAMEL_QUARKUS_VERSION is set when RUN_AGAINST_MRRC_ONLY is NOT enabled
+if [[ "$RUN_AGAINST_MRRC_ONLY" != "true" && "$UPSTREAM" != "true" && -z "$CAMEL_QUARKUS_VERSION" ]]; then
+  echo "Error: When --run-against-mrrc-only is NOT set, CAMEL_QUARKUS_VERSION must be specified via:"
+  echo "  --camel-quarkus-version parameter"
+  exit 1
+fi
+
+if [[ -z "$CAMEL_VERSION" && -n "$MRRC_LOCAL" && "$RUN_AGAINST_MRRC_ONLY" == "true" ]]; then
   CAMEL_VERSION="$(ls "${MRRC_LOCAL}/org/apache/camel/camel-direct/" 2>/dev/null | head -1)"
   log "CAMEL_VERSION derived from MRRC_LOCAL"
 fi
 log "CAMEL_VERSION = $CAMEL_VERSION"
 
+# Validate that CAMEL_VERSION is set when RUN_AGAINST_MRRC_ONLY is enabled
+if [[ "$RUN_AGAINST_MRRC_ONLY" == "true" && -z "$CAMEL_VERSION" ]]; then
+  echo "Error: When --run-against-mrrc-only is set, CAMEL_VERSION must be specified either via:"
+  echo "  1. --camel-version parameter, or"
+  echo "  2. --mrrc-local (CAMEL_VERSION will be derived from MRRC)"
+  exit 1
+fi
+
 # Build common Maven arguments
 COMMON_MVN_ARGS="-B -ntp -Dformatter.skip -Dimpsort.skip -Denforcer.skip -DbuildMetaData.skip -Dcq.camel-prod-excludes.skip=true -Dcamel-quarkus.update-extension-doc-page.skip -Djava.home=$JAVA_HOME"
 
@@ -310,7 +333,7 @@ if [[ "$TEST_ONLY" != "true" ]]; then
     # Hack to fix the missing Jetty BOM (CEQ-8802)
     if [[ -f "poms/bom/src/main/generated/flattened-reduced-pom.xml" ]]; then
       log "Copying flattened-reduced-pom.xml to poms/bom/pom.xml"
-      cp poms/bom/src/main/generated/flattened-reduced-pom.xml poms/bom/pom.xml
+      cp poms/bom/src/main/generated/flattened-reduced-pom.xml poms/bom/pom.xml || exit $?
     fi
 
     # Replace Camel version in the top pom.xml
@@ -321,10 +344,43 @@ cd /*[local-name()="project"]/*[local-name()="parent"]/*[local-name()="version"]
 set $CAMEL_VERSION
 save
 EOF
+      if [[ $? -ne 0 ]]; then
+        echo "Error: Failed to replace Camel parent version in pom.xml"
+        exit 1
+      fi
+
       xmllint --shell pom.xml <<EOF
 cd /*[local-name()="project"]/*[local-name()="properties"]/*[local-name()="camel.version"]
 set $CAMEL_VERSION
 save
+EOF
+      if [[ $? -ne 0 ]]; then
+        echo "Error: Failed to replace Camel version property in pom.xml"
+        exit 1
+      fi
+    fi
+
+    # Replace Quarkus version in the top pom.xml
+    if [[ -n "$QUARKUS_VERSION" ]]; then
+      log "Replacing Quarkus version to $QUARKUS_VERSION in pom.xml"
+      xmllint --shell pom.xml <<EOF
+cd /*[local-name()="project"]/*[local-name()="properties"]/*[local-name()="quarkus.version"]
+set $QUARKUS_VERSION
+save
+EOF
+      if [[ $? -ne 0 ]]; then
+        echo "Error: Failed to replace Quarkus version property in pom.xml"
+        exit 1
+      fi
+    fi
+
+    # Replace Quarkus version in the top pom.xml
+    if [[ -n "$QUARKUS_VERSION" ]]; then
+      log "Replacing Quarkus version to $QUARKUS_VERSION in pom.xml"
+      xmllint --shell pom.xml <<EOF
+cd /*[local-name()="project"]/*[local-name()="properties"]/*[local-name()="quarkus.version"]
+set $QUARKUS_VERSION
+save
 EOF
     fi
   fi
@@ -354,6 +410,11 @@ EOF
         $SETTINGS_XML_ARG \
         $MVN_EXTRA \
         $module
+      MVN_EXIT_CODE=$?
+      if [[ $MVN_EXIT_CODE -ne 0 ]]; then
+        echo "Error: Maven build failed for module $module with exit code $MVN_EXIT_CODE"
+        exit $MVN_EXIT_CODE
+      fi
     done
   fi
 fi