Bump maven container

hapi-fhir-jpaserver-base/pom.xml

@@ -338,16 +338,6 @@
  <groupId>org.springframework.data</groupId>
  <artifactId>spring-data-envers</artifactId>
  </dependency>
- <!-- FIXME: remove?
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-phonetic</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-backward-codecs</artifactId>
- </dependency>
- -->
  <dependency>
  <groupId>org.apache.lucene</groupId>
  <artifactId>lucene-analysis-phonetic</artifactId>

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermReadSvcImpl.java

@@ -1344,8 +1344,7 @@ private ValueSet.ConceptReferenceComponent getMatchedConceptIncludedInValueSet(
  /**
  * Helper method which builds a predicate for the expansion
  */
- private PredicateFinalStep buildExpansionPredicate(
- List<String> theCodes, SearchPredicateFactory thePredicate) {
+ private PredicateFinalStep buildExpansionPredicate(List<String> theCodes, SearchPredicateFactory thePredicate) {
  assert !theCodes.isEmpty();
  return thePredicate.simpleQueryString().field("myCode").matching(String.join(" | ", theCodes));
  }

pom.xml

@@ -1548,18 +1548,6 @@
  <artifactId>jena-arq</artifactId>
  <version>${jena_version}</version>
  </dependency>
- <!-- FIXME: remove?
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-phonetic</artifactId>
- <version>${lucene_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-backward-codecs</artifactId>
- <version>${lucene_version}</version>
- </dependency>
- -->
  <dependency>
  <groupId>org.apache.lucene</groupId>
  <artifactId>lucene-analysis-phonetic</artifactId>

release-pipeline.yml

@@ -140,7 +140,7 @@ jobs:
  # want to fail fast if there is an issue, and avoid running the tests more than once, so it doesn't take all day.
  timeoutInMinutes: 360
  dependsOn: ['get_release_version', 'get_branch_id']
- container: maven:3-amazoncorretto-21
+ container: maven:3.9-eclipse-temurin-21-jammy
  steps:
  - task: Cache@2
  inputs:
@@ -153,7 +153,7 @@ jobs:
  releaseType: stable
  - task: Maven@3
  env:
- JAVA_HOME_11_X64: /usr/java/openjdk-17
+ JAVA_HOME_11_X64: /usr/java/openjdk
  displayName: Checkstyle Build
  inputs:
  mavenPomFile: 'hapi-fhir-checkstyle/pom.xml'
@@ -166,7 +166,7 @@ jobs:
  script: mkdir -p $(MAVEN_CACHE_FOLDER); pwd; ls -al $(MAVEN_CACHE_FOLDER)
  - task: Maven@3
  env:
- JAVA_HOME_11_X64: /usr/java/openjdk-17
+ JAVA_HOME_11_X64: /opt/java/openjdk
  inputs:
  goals: 'clean install'
  # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy

snapshot-pipeline.yml

@@ -24,7 +24,7 @@ variables:
 - group: GPG_VARIABLE_GROUP
 - group: SONATYPE_VARIABLE_GROUP
 
-container: maven:3-amazoncorretto-21
+container: maven:3.9-eclipse-temurin-21-jammy
 steps:
 
  # We need a valid signing key to sign our builds for deployment to sonatype. We have uploaded
@@ -92,7 +92,7 @@ steps:
  # 5. Deploy SNAPSHOT build to sonatype
  - task: Maven@3
  env:
- JAVA_HOME_11_X64: /usr/java/openjdk-17
+ JAVA_HOME_11_X64: /opt/java/openjdk
  displayName: 'Deploy to Sonatype staging'
  inputs:
  mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'

test-job-template.yml

@@ -7,7 +7,7 @@ jobs:
  - job: setup
  displayName: setup-and-cache-build
  timeoutInMinutes: 60
- container: maven:3-amazoncorretto-21
+ container: maven:3.9-eclipse-temurin-21-jammy
  pool:
  vmImage: ubuntu-latest
  steps:
@@ -23,7 +23,7 @@ jobs:
  script: mkdir -p $(MAVEN_CACHE_FOLDER); pwd; ls -al $(MAVEN_CACHE_FOLDER)
  - task: Maven@3
  env:
- JAVA_HOME_11_X64: /usr/java/openjdk-17
+ JAVA_HOME_11_X64: /opt/java/openjdk
  inputs:
  goals: 'install'
  # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
@@ -36,7 +36,7 @@ jobs:
  timeoutInMinutes: 60
  displayName: ${{ p.name }}
  dependsOn: [ 'setup' ]
- container: maven:3-amazoncorretto-21
+ container: maven:3.9-eclipse-temurin-21-jammy
  pool:
  vmImage: ubuntu-latest
  steps:
@@ -55,7 +55,7 @@ jobs:
  path: $(MAVEN_CACHE_FOLDER)
  - task: Maven@3
  env:
- JAVA_HOME_11_X64: /usr/java/openjdk-17
+ JAVA_HOME_11_X64: /opt/java/openjdk
  inputs:
  mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'
  goals: 'clean verify jacoco:report -pl ${{ p.module }}'
@@ -90,7 +90,7 @@ jobs:
  vmImage: ubuntu-latest
  timeoutInMinutes: 60
  displayName: generate_test_reports
- container: maven:3-amazoncorretto-21
+ container: maven:3.9-eclipse-temurin-21-jammy
  dependsOn:
  - ${{ each p in parameters.modules }}:
  - ${{ p.name }}
@@ -119,7 +119,7 @@ jobs:
  targetFolder: '$(System.DefaultWorkingDirectory)/${{ p.module }}/target/'
  - task: Maven@3
  env:
- JAVA_HOME_11_X64: /usr/java/openjdk-17
+ JAVA_HOME_11_X64: /usr/java/openjdk
  inputs:
  mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'
  goals: 'jacoco:report-aggregate'