Merge remote-tracking branch 'origin/ranger/update-policy-cleanup' in…

…to foundation-2023
OpenNMS · Jun 27, 2023 · 3aef400 · 3aef400
2 parents 640c388 + 1e4e342
commit 3aef400
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 16 deletions.
diff --git a/.circleci/scripts/structure-settings.xml b/.circleci/scripts/structure-settings.xml
@@ -10,6 +10,10 @@
           <id>opennms-repo</id>
           <name>OpenNMS Mega-Repository</name>
           <url>https://maven.opennms.org/repository/everything/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
           <snapshots>
             <enabled>false</enabled>
           </snapshots>
@@ -18,6 +22,10 @@
           <id>central</id>
           <name>Maven Central</name>
           <url>https://repo1.maven.org/maven2/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
           <snapshots>
             <enabled>false</enabled>
           </snapshots>
@@ -28,6 +36,10 @@
           <id>opennms-repo</id>
           <name>OpenNMS Mega-Repository</name>
           <url>https://maven.opennms.org/repository/everything/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
           <snapshots>
             <enabled>false</enabled>
           </snapshots>
@@ -36,6 +48,10 @@
           <id>central</id>
           <name>Maven Central</name>
           <url>https://repo1.maven.org/maven2/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
           <snapshots>
             <enabled>false</enabled>
           </snapshots>

diff --git 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
@@ -113,6 +113,13 @@
     <repository>
       <id>jaspersoft-third-party</id>
       <url>https://maven.opennms.org/repository/thirdparty/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
     </repository>
   </repositories>
 </project>
diff --git a/dependencies/oia/pom.xml b/dependencies/oia/pom.xml
@@ -59,6 +59,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
+        <updatePolicy>${updatePolicy}</updatePolicy>
       </snapshots>
     </repository>
   </repositories>

diff --git a/pom.xml b/pom.xml
@@ -1574,6 +1574,7 @@
     <!-- whether to enable snapshot dependencies when building -->
     <enable.snapshots>false</enable.snapshots>
 
+    <updatePolicy>interval:480</updatePolicy> <!-- 8 hours, only used for snapshot repos -->
     <maven.clover.licenseLocation>${user.home}/.m2/clover.license</maven.clover.licenseLocation>
 
     <karaf.servicemix.specs.version>2.9.0</karaf.servicemix.specs.version>
@@ -1852,12 +1853,13 @@
         </plugins>
       </build>
       <repositories>
-        <!-- Disable snapshots for our own artifacts for release bulds -->
+        <!-- Disable snapshots for our own artifacts for release builds -->
         <repository>
           <id>opennms-ossrh</id>
           <url>https://oss.sonatype.org/content/repositories/snapshots</url>
           <releases>
-            <enabled>false</enabled>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
           </releases>
           <snapshots>
             <enabled>false</enabled>
@@ -1953,8 +1955,13 @@
           <id>central</id>
           <name>Maven Central</name>
           <url>https://repo1.maven.org/maven2/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
           <snapshots>
             <enabled>true</enabled>
+            <updatePolicy>${updatePolicy}</updatePolicy>
           </snapshots>
         </repository>
         <repository>
@@ -1966,6 +1973,7 @@
           </releases>
           <snapshots>
             <enabled>true</enabled>
+            <updatePolicy>${updatePolicy}</updatePolicy>
           </snapshots>
         </repository>
         <repository>
@@ -1976,6 +1984,7 @@
           </releases>
           <snapshots>
             <enabled>true</enabled>
+            <updatePolicy>${updatePolicy}</updatePolicy>
           </snapshots>
         </repository>
       </repositories>
@@ -1987,8 +1996,13 @@
           <id>central</id>
           <name>Maven Central</name>
           <url>https://repo1.maven.org/maven2/</url>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
           <snapshots>
             <enabled>true</enabled>
+            <updatePolicy>${updatePolicy}</updatePolicy>
           </snapshots>
         </pluginRepository>
         <pluginRepository>
@@ -2000,6 +2014,7 @@
           </releases>
           <snapshots>
             <enabled>true</enabled>
+            <updatePolicy>${updatePolicy}</updatePolicy>
           </snapshots>
         </pluginRepository>
       </pluginRepositories>

diff --git a/smoke-test/pom.xml b/smoke-test/pom.xml
@@ -994,6 +994,10 @@
       <id>central</id>
       <name>Maven Central</name>
       <url>https://repo1.maven.org/maven2/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
@@ -1002,6 +1006,10 @@
       <id>opennms-repo</id>
       <name>OpenNMS Mega-Repository</name>
       <url>https://maven.opennms.org/repository/everything/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>

diff --git 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
@@ -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
@@ -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