From 80fbc71b8e81076b23c8913fb7ceb7ce8ef0e4c2 Mon Sep 17 00:00:00 2001 From: Tiago Bueno Date: Tue, 7 May 2024 15:29:16 +0000 Subject: [PATCH] fix makefile to work fine with idea --- .gitignore | 4 +++- .mvn/settings.xml | 38 -------------------------------------- Makefile | 7 ++++--- Makefile.downstream | 11 ++++++----- 4 files changed, 13 insertions(+), 47 deletions(-) delete mode 100644 .mvn/settings.xml diff --git a/.gitignore b/.gitignore index f6703f30..089ae45d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,20 @@ .idea/ -.vscode/ *.iml /target/* */target/* */test-logs/ */test-tmp/* +pom.xml.versionsBackup test_upgrade_plan.yaml version_map.yaml common.yaml settings.xml +performance/ operator-suite/artemis/ operator-suite/certificates/ operator-suite/operator-suite.log +operator-suite/serialization-dump/ standalone-suite/artemis/ standalone-suite/standalone-suite.log standalone-suite/test_cfg/ diff --git a/.mvn/settings.xml b/.mvn/settings.xml deleted file mode 100644 index 0169be13..00000000 --- a/.mvn/settings.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - downstream - - - staged_maven_repository - http://messaging-qe-repo.usersys.redhat.com:8081/artifactory/amq-operator-crd/ - - - maven.repository.redhat.com_ga - https://maven.repository.redhat.com/ga - - - - - - - staged-maven-repository-maven-default-http-blocker - external:http:* - Pseudo repository to mirror external repositories initially using HTTP. - http://messaging-qe-repo.usersys.redhat.com:8081/artifactory/amq-operator-crd/ - - - redhat-maven-central - Red Hat Maven Central mirror - https://repository.engineering.redhat.com/nexus/content/repositories/central/ - central - - - - - - downstream - - diff --git a/Makefile b/Makefile index a8c9832a..b0f9850f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html). # ROOT_DIR = $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -MVN_DEFAULT_CMD = mvn -T 1.5C --no-transfer-progress +MVN_DEFAULT_CMD = mvn -T 1.5C --no-transfer-progress --update-snapshots MVN_TEST_CMD = ${MVN_DEFAULT_CMD} -Dfailsafe.rerunFailingTestsCount=3 failsafe:integration-test WGET_CMD = wget -nv -c @@ -47,11 +47,12 @@ endif clean: clean_maven standalone_clean operator_clean clean_maven: - ${MVN_DEFAULT_CMD} clean + ${MVN_DEFAULT_CMD} --no-transfer-progress versions:revert clean build: standalone_prepare operator_prepare build_maven build_maven: + ${MVN_DEFAULT_CMD} versions:update-property -DallowDowngrade=true -Dproperty=artemiscloud-crd.version -DnewVersion=[${OPERATOR_VERSION}] ${MVN_DEFAULT_CMD} -DskipTests install checkstyle: @@ -106,7 +107,7 @@ operator_prepare_dirs: operator_prepare: operator_prepare_dirs operator_build_java: - ${MVN_DEFAULT_CMD} versions:update-property -Dproperty=artemiscloud-crd.version -DnewVersion=${OPERATOR_VERSION} + ${MVN_DEFAULT_CMD} versions:update-property -DallowDowngrade=true -Dproperty=artemiscloud-crd.version -DnewVersion=[${OPERATOR_VERSION}] ${MVN_DEFAULT_CMD} --projects :operator-suite install -DskipTests operator_build: operator_prepare operator_build_java diff --git a/Makefile.downstream b/Makefile.downstream index e9843c2d..391ed52e 100644 --- a/Makefile.downstream +++ b/Makefile.downstream @@ -37,12 +37,13 @@ clean: clean_maven standalone_clean operator_clean - rm -f ${ROOT_DIR}/{settings.xml,version_map.yaml,common.yaml} clean_maven: - mvn --no-transfer-progress clean + mvn --no-transfer-progress versions:revert clean build: standalone_prepare operator_prepare build_maven build_maven: - ${MVN_DEFAULT_CMD} -DskipTests -Dartemiscloud-crd.version=${OPERATOR_CR_VERSION} install + ${MVN_DEFAULT_CMD} versions:update-property -DallowDowngrade=true -Dproperty=artemiscloud-crd.version -DnewVersion=[${OPERATOR_CR_VERSION}] + ${MVN_DEFAULT_CMD} -DskipTests install checkstyle: get_settings_xml_file ${MVN_DEFAULT_CMD} checkstyle:check @@ -51,8 +52,8 @@ get_settings_xml_file: ${WGET_CMD} "https://gitlab.cee.redhat.com/amq-broker/amq-broker-ci/-/raw/main/resources/claire/claire-settings.xml" -O "${ROOT_DIR}/settings.xml" get_metadata_files: - ${WGET_CMD} "https://gitlab.cee.redhat.com/amq-broker/amq-broker-metadata/-/raw/main/broker_properties/amq_broker/version_map.yaml" -P "${ROOT_DIR}" - ${WGET_CMD} "https://gitlab.cee.redhat.com/amq-broker/amq-broker-metadata/-/raw/main/broker_properties/amq_broker/common.yaml" -P "${ROOT_DIR}" + ${WGET_CMD} "https://gitlab.cee.redhat.com/amq-broker/amq-broker-metadata/-/raw/main/broker_properties/amq_broker/version_map.yaml" -O "${ROOT_DIR}/version_map.yaml" + ${WGET_CMD} "https://gitlab.cee.redhat.com/amq-broker/amq-broker-metadata/-/raw/main/broker_properties/amq_broker/common.yaml" -O "${ROOT_DIR}/common.yaml" ### Standalone targets standalone_clean: @@ -117,7 +118,7 @@ operator_prepare_urls: operator_prepare: get_settings_xml_file get_metadata_files operator_prepare_urls operator_prepare_dirs operator_build_java: - ${MVN_DEFAULT_CMD} versions:update-property -Dproperty=artemiscloud-crd.version -DnewVersion=${OPERATOR_CR_VERSION} + ${MVN_DEFAULT_CMD} versions:update-property -DallowDowngrade=true -Dproperty=artemiscloud-crd.version -DnewVersion=[${OPERATOR_CR_VERSION}] ${MVN_DEFAULT_CMD} --projects :operator-suite install -DskipTests operator_build: operator_prepare operator_build_java