From 1e4e342cc2efaf6d7d230522c0d666e2612caa46 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 26 Jun 2023 12:46:53 -0400 Subject: [PATCH] reinstate updatePolicy, but make it a lot smarter * non-snapshot repos should _never_ check for updates, upstream versions (should) never change if they're not snapshots * snapshots default to checking every 8 hours but can be overridden on the CLI --- .circleci/scripts/structure-settings.xml | 16 ++++++++++++ debian/get-build-args.sh | 4 +-- dependencies/jasper/pom.xml | 7 ++++++ dependencies/oia/pom.xml | 1 + pom.xml | 19 ++++++++++++-- smoke-test/pom.xml | 8 ++++++ .../packages/minion/create-minion-assembly.sh | 25 +++++++++++++++---- tools/packages/opennms/opennms.spec | 2 -- .../sentinel/create-sentinel-assembly.sh | 25 +++++++++++++++---- 9 files changed, 91 insertions(+), 16 deletions(-) diff --git a/.circleci/scripts/structure-settings.xml b/.circleci/scripts/structure-settings.xml index 4f2fe23c93db..fc7cd290b9c7 100644 --- a/.circleci/scripts/structure-settings.xml +++ b/.circleci/scripts/structure-settings.xml @@ -10,6 +10,10 @@ opennms-repo OpenNMS Mega-Repository https://maven.opennms.org/repository/everything/ + + true + never + false @@ -18,6 +22,10 @@ central Maven Central https://repo1.maven.org/maven2/ + + true + never + false @@ -28,6 +36,10 @@ opennms-repo OpenNMS Mega-Repository https://maven.opennms.org/repository/everything/ + + true + never + false @@ -36,6 +48,10 @@ central Maven Central https://repo1.maven.org/maven2/ + + true + never + false diff --git a/debian/get-build-args.sh b/debian/get-build-args.sh index 83d8fc95ae05..5baf7e1e6b85 100755 --- a/debian/get-build-args.sh +++ b/debian/get-build-args.sh @@ -9,9 +9,9 @@ if [ -f "$OPENNMS_SETTINGS_XML" ]; then fi if [ -z "$OPENNMS_ENABLE_SNAPSHOTS" ] || [ "$OPENNMS_ENABLE_SNAPSHOTS" = 1 ]; then - ARGS+=(-Denable.snapshots=true -DupdatePolicy=always) + ARGS+=(-Denable.snapshots=true) else - ARGS+=(-Denable.snapshots=false -DupdatePolicy=never) + ARGS+=(-Denable.snapshots=false) fi case "${CIRCLE_BRANCH}" in diff --git a/dependencies/jasper/pom.xml b/dependencies/jasper/pom.xml index f2fa3ddb43c5..6b3a99ffee65 100644 --- a/dependencies/jasper/pom.xml +++ b/dependencies/jasper/pom.xml @@ -113,6 +113,13 @@ jaspersoft-third-party https://maven.opennms.org/repository/thirdparty/ + + true + never + + + false + diff --git a/dependencies/oia/pom.xml b/dependencies/oia/pom.xml index 01046e37f9fb..86d5d1515072 100644 --- a/dependencies/oia/pom.xml +++ b/dependencies/oia/pom.xml @@ -59,6 +59,7 @@ true + ${updatePolicy} diff --git a/pom.xml b/pom.xml index 0c4ac45b86ef..6d1d69d921a3 100644 --- a/pom.xml +++ b/pom.xml @@ -1574,6 +1574,7 @@ false + interval:480 ${user.home}/.m2/clover.license 2.9.0 @@ -1852,12 +1853,13 @@ - + opennms-ossrh https://oss.sonatype.org/content/repositories/snapshots - false + true + never false @@ -1953,8 +1955,13 @@ central Maven Central https://repo1.maven.org/maven2/ + + true + never + true + ${updatePolicy} @@ -1966,6 +1973,7 @@ true + ${updatePolicy} @@ -1976,6 +1984,7 @@ true + ${updatePolicy} @@ -1987,8 +1996,13 @@ central Maven Central https://repo1.maven.org/maven2/ + + true + never + true + ${updatePolicy} @@ -2000,6 +2014,7 @@ true + ${updatePolicy} diff --git a/smoke-test/pom.xml b/smoke-test/pom.xml index a4b4d54aa67e..76de980555bf 100644 --- a/smoke-test/pom.xml +++ b/smoke-test/pom.xml @@ -994,6 +994,10 @@ central Maven Central https://repo1.maven.org/maven2/ + + true + never + false @@ -1002,6 +1006,10 @@ opennms-repo OpenNMS Mega-Repository https://maven.opennms.org/repository/everything/ + + true + never + false diff --git a/tools/packages/minion/create-minion-assembly.sh b/tools/packages/minion/create-minion-assembly.sh index 40cb4dbcfe7a..f17e86992f1f 100755 --- a/tools/packages/minion/create-minion-assembly.sh +++ b/tools/packages/minion/create-minion-assembly.sh @@ -8,7 +8,6 @@ export OPTS_ASSEMBLIES="-Passemblies" export OPTS_PROFILES="-Prun-expensive-tasks" OPTS_ENABLE_SNAPSHOTS="" -OPTS_UPDATE_POLICY="-DupdatePolicy=never" OPTS_PRODUCTION="" TOPDIR="$(pwd)" @@ -34,7 +33,6 @@ do ;; s) OPTS_ENABLE_SNAPSHOTS="-Denable.snapshots=true" - OPTS_UPDATE_POLICY="-DupdatePolicy=always" ;; c) SKIP_COMPILE=1 @@ -54,7 +52,15 @@ esac # always build the root POM, just to be sure inherited properties/plugin/dependencies are right echo "=== Building root POM ===" -"${TOPDIR}/compile.pl" $OPTS_SKIP_TESTS $OPTS_SKIP_TARBALL $OPTS_ENABLE_SNAPSHOTS $OPTS_UPDATE_POLICY $OPTS_PRODUCTION --projects org.opennms:opennms install --builder smart --threads ${CCI_MAXCPU:-2} +"${TOPDIR}/compile.pl" \ + $OPTS_SKIP_TESTS \ + $OPTS_SKIP_TARBALL \ + $OPTS_ENABLE_SNAPSHOTS \ + $OPTS_PRODUCTION \ + --projects org.opennms:opennms \ + --builder smart \ + --threads ${CCI_MAXCPU:-2} \ + install COMPILE="./compile.pl" @@ -69,12 +75,21 @@ else fi echo "" -"${COMPILE}" $OPTS_MAVEN $OPTS_SKIP_TESTS $OPTS_SKIP_TARBALL $OPTS_ENABLE_SNAPSHOTS $OPTS_UPDATE_POLICY $OPTS_PROFILES $OPTS_PRODUCTION $OPTS_ASSEMBLIES \ +"${COMPILE}" \ + $OPTS_MAVEN \ + $OPTS_SKIP_TESTS \ + $OPTS_SKIP_TARBALL \ + $OPTS_ENABLE_SNAPSHOTS \ + $OPTS_PROFILES \ + $OPTS_PRODUCTION \ + $OPTS_ASSEMBLIES \ -DvaadinJavaMaxMemory=${CCI_VAADINJAVAMAXMEM:-1g} \ -DmaxCpus=${CCI_MAXCPU:-2} \ --projects "org.opennms.assemblies:org.opennms.assemblies.minion" \ --also-make \ - install --builder smart --threads ${CCI_MAXCPU:-2} + --builder smart \ + --threads ${CCI_MAXCPU:-2} \ + install echo "=== Finished ===" echo "Your tarball is in:" opennms-assemblies/minion/target/org.opennms.assemblies.minion-*-minion.tar.gz diff --git a/tools/packages/opennms/opennms.spec b/tools/packages/opennms/opennms.spec index 84ff9da1116f..66e9b561aa9e 100644 --- a/tools/packages/opennms/opennms.spec +++ b/tools/packages/opennms/opennms.spec @@ -487,10 +487,8 @@ if [ -e "settings.xml" ]; then export OPTS_SETTINGS_XML="-s `pwd`/settings.xml" fi -OPTS_UPDATE_POLICY="-DupdatePolicy=never" if [ "%{enable_snapshots}" = 1 ]; then OPTS_ENABLE_SNAPSHOTS="-Denable.snapshots=true" - OPTS_UPDATE_POLICY="-DupdatePolicy=always" fi OPTS_PRODUCTION="" diff --git a/tools/packages/sentinel/create-sentinel-assembly.sh b/tools/packages/sentinel/create-sentinel-assembly.sh index a8e56c56ef69..4635d6d6d86f 100755 --- a/tools/packages/sentinel/create-sentinel-assembly.sh +++ b/tools/packages/sentinel/create-sentinel-assembly.sh @@ -8,7 +8,6 @@ export OPTS_ASSEMBLIES="-Passemblies" export OPTS_PROFILES="-Prun-expensive-tasks" OPTS_ENABLE_SNAPSHOTS="" -OPTS_UPDATE_POLICY="-DupdatePolicy=never" OPTS_PRODUCTION="" TOPDIR="$(pwd)" @@ -34,7 +33,6 @@ do ;; s) OPTS_ENABLE_SNAPSHOTS="-Denable.snapshots=true" - OPTS_UPDATE_POLICY="-DupdatePolicy=always" ;; c) SKIP_COMPILE=1 @@ -54,7 +52,15 @@ esac # always build the root POM, just to be sure inherited properties/plugin/dependencies are right echo "=== Building root POM ===" -"${TOPDIR}/compile.pl" $OPTS_SKIP_TESTS $OPTS_SKIP_TARBALL $OPTS_ENABLE_SNAPSHOTS $OPTS_UPDATE_POLICY $OPTS_PRODUCTION --projects org.opennms:opennms install --builder smart --threads ${CCI_MAXCPU:-2} +"${TOPDIR}/compile.pl" \ + $OPTS_SKIP_TESTS \ + $OPTS_SKIP_TARBALL \ + $OPTS_ENABLE_SNAPSHOTS \ + $OPTS_PRODUCTION \ + --projects org.opennms:opennms \ + --builder smart \ + --threads ${CCI_MAXCPU:-2} \ + install COMPILE="./compile.pl" @@ -68,12 +74,21 @@ else fi echo "" -"$COMPILE" $OPTS_MAVEN $OPTS_SKIP_TESTS $OPTS_SKIP_TARBALL $OPTS_ENABLE_SNAPSHOTS $OPTS_UPDATE_POLICY $OPTS_PROFILES $OPTS_PRODUCTION $OPTS_ASSEMBLIES \ +"$COMPILE" \ + $OPTS_MAVEN \ + $OPTS_SKIP_TESTS \ + $OPTS_SKIP_TARBALL \ + $OPTS_ENABLE_SNAPSHOTS \ + $OPTS_PROFILES \ + $OPTS_PRODUCTION \ + $OPTS_ASSEMBLIES \ -DvaadinJavaMaxMemory=${CCI_VAADINJAVAMAXMEM:-1g} \ -DmaxCpus=${CCI_MAXCPU:-2} \ --projects "org.opennms.assemblies:org.opennms.assemblies.sentinel" \ --also-make \ - install --builder smart --threads ${CCI_MAXCPU:-2} + --builder smart \ + --threads ${CCI_MAXCPU:-2} \ + install echo "=== Finished ===" echo "Your tarball is in:" opennms-assemblies/sentinel/target/org.opennms.assemblies.sentinel-*-sentinel.tar.gz