Adjust which ORM snapshot versions are tested

Author: marko-bekhta

ci/dependency-update/Jenkinsfile

@@ -9,11 +9,11 @@
 // Also make sure to update the parameters in the parameters {} section of the pipeline.
 Map settings() {
 	switch (env.DEPENDENCY_UPDATE_NAME) {
-		case 'orm7.1':
+		case 'orm':
 			return [
 					updateProperties: ['version.org.hibernate.orm'],
 					onlyRunTestDependingOn: ['hibernate-search-mapper-orm'],
-					// just rebuild all dependants since ORM7 upgrade will affect all mappers
+					// just rebuild all dependants since ORM upgrade will affect all mappers
 					additionalMavenArgs: '-am'
 			]
 		case 'lucene9.12':
@@ -142,7 +142,7 @@ pipeline {
 	parameters {
 		// choice parameter doesn't have a default, but the first value should be treated as a default, if it wasn't specified manually.
 		// Make sure tp update axis and settings() when adding new choice parameter.
-		choice(name: 'UPDATE_JOB', choices: ['all', 'orm7.1', 'lucene9.12','lucene9', 'lucene10', 'lucene-future', 'elasticsearch-current', 'elasticsearch-next'], description: 'Select which update jobs to run. `All` will include all configured update jobs.')
+		choice(name: 'UPDATE_JOB', choices: ['all', 'orm', 'lucene9.12','lucene9', 'lucene10', 'lucene-future', 'elasticsearch-current', 'elasticsearch-next'], description: 'Select which update jobs to run. `All` will include all configured update jobs.')
 		string(name: 'ORM_REPOSITORY', defaultValue: '', description: 'Git URL to Hibernate ORM repository. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_BRANCH. Provide an http repository URL rather than an ssh one.')
 		string(name: 'ORM_BRANCH', defaultValue: '', description: 'Hibernate ORM branch to build from. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_REPOSITORY. Either a pull request ID or a branch name should be provided, but not both at the same time. Use branch if you want to build from a fork repository.')
 		string(name: 'ORM_PULL_REQUEST_ID', defaultValue: '', description: 'Hibernate ORM pull request id to build from. If provided, Hibernate ORM will be built locally. Works only in pair with ORM_REPOSITORY. Either a pull request ID or a branch name should be provided, but not both at the same time.')
@@ -243,7 +243,7 @@ pipeline {
 						name 'DEPENDENCY_UPDATE_NAME'
 						// NOTE: Remember to update the settings() method above when changing this.
 						// And also add a new choice parameter in the parameters {} section of the pipeline
-						values 'orm7.1', 'lucene9.12','lucene9', 'lucene10', 'lucene-future', 'elasticsearch-current', 'elasticsearch-next'
+						values 'orm', 'lucene9.12','lucene9', 'lucene10', 'lucene-future', 'elasticsearch-current', 'elasticsearch-next'
 					}
 				}
 				stages {

ci/dependency-update/rules-orm7.1.xml renamed to ci/dependency-update/rules-orm.xml

@@ -7,6 +7,6 @@
     <ignoreVersion type="regex">.*\.(Alpha|Beta|CR).*</ignoreVersion>
     <!-- Restrict allowed versions to a particular major/minor, because forbidding major/minor upgrades
          in the version-maven-plugin configuration doesn't always work for some reason. -->
-    <ignoreVersion type="regex">(?!7\.1\.).*</ignoreVersion>
+    <ignoreVersion type="regex">^([0-6]\.\d+|7\.[0-1])\..*</ignoreVersion>
   </ignoreVersions>
 </ruleset>