fix makefile to work fine with idea

rh-messaging-qe · May 7, 2024 · 80fbc71 · 80fbc71
1 parent adff2d1
commit 80fbc71
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 47 deletions.
diff --git 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
diff --git 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
@@ -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