Update packages

.github/actions/build-cache/action.yml

@@ -14,7 +14,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up JDK ${{ inputs.java-version }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ inputs.java-version }}
         distribution: "temurin"

.github/actions/build-module/action.yml

@@ -15,12 +15,12 @@ runs:
   using: "composite"
   steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 1
 
     - name: Set up Java 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

.github/actions/generate-module-list/action.yml

@@ -13,10 +13,10 @@ runs:
   using: 'composite'
   steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'adopt'
         java-version: '17'

.github/actions/run-tests-and-archive-results/action.yml

@@ -18,7 +18,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up JDK ${{ inputs.java-version }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ inputs.java-version }}
         distribution: 'temurin'

.github/workflows/spotless.yml

@@ -11,9 +11,9 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'

hapi-fhir-android/.gitignore

@@ -0,0 +1 @@
+

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java

@@ -463,8 +463,8 @@ private void scanResourceForSearchParams(
 	@SuppressWarnings("JavadocLinkAsPlainText")
 	private String toCanonicalSearchParameterUri(RuntimeResourceDefinition theResourceDef, String theName) {
 		return switch (theName) {
-				// Hard-code a few URLs that we know don't follow the
-				// usual pattern
+			// Hard-code a few URLs that we know don't follow the
+			// usual pattern
 			case Constants.PARAM_LANGUAGE -> Constants.PARAM_LANGUAGE_URL;
 			case Constants.PARAM_TEXT -> Constants.PARAM_TEXT_URL;
 			case Constants.PARAM_CONTENT -> Constants.PARAM_CONTENT_URL;

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IEntityResult.java

@@ -19,7 +19,7 @@
  */
 package ca.uhn.fhir.rest.gclient;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.io.InputStream;
 import java.util.List;

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java

@@ -490,10 +490,10 @@ public static String sanitizeUrlPart(CharSequence theString) {
 
 				char nextChar = theString.charAt(j);
 				switch (nextChar) {
-						/*
-						 * NB: If you add a constant here, you also need to add it
-						 * to isNeedsSanitization()!!
-						 */
+					/*
+					 * NB: If you add a constant here, you also need to add it
+					 * to isNeedsSanitization()!!
+					 */
 					case '\'':
 						buffer.append("'");
 						break;

hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java

@@ -55,7 +55,6 @@
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.Base64Utils;
 
 import java.io.BufferedReader;
 import java.io.Console;
@@ -68,6 +67,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -363,7 +363,7 @@ protected String getAndParseOptionBasicAuthHeader(CommandLine theCommandLine, St
 			}
 
 			byte[] basicAuth = optionValue.getBytes();
-			String base64EncodedBasicAuth = Base64Utils.encodeToString(basicAuth);
+			String base64EncodedBasicAuth = Base64.getEncoder().encodeToString(basicAuth);
 			basicAuthHeaderValue = Constants.HEADER_AUTHORIZATION_VALPREFIX_BASIC + base64EncodedBasicAuth;
 		}
 		return basicAuthHeaderValue;

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java

@@ -139,7 +139,6 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBinary;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
@@ -151,9 +150,11 @@
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
+import org.jspecify.annotations.NonNull;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1424,8 +1425,7 @@ private void addParam(String theName, IBase theValue) {
 		}
 
 		private void addParam(String theName, IQueryParameterType theValue) {
-			IPrimitiveType<?> stringType =
-					ParametersUtil.createString(myContext, theValue.getValueAsQueryToken(myContext));
+			IPrimitiveType<?> stringType = ParametersUtil.createString(myContext, theValue.getValueAsQueryToken());
 			addParam(theName, stringType);
 		}
 
@@ -2206,11 +2206,11 @@ public OUTPUT execute() {
 			Map<String, List<String>> params = getParamMap();
 
 			for (TokenParam next : myTags) {
-				addParam(params, Constants.PARAM_TAG, next.getValueAsQueryToken(myContext));
+				addParam(params, Constants.PARAM_TAG, next.getValueAsQueryToken());
 			}
 
 			for (TokenParam next : mySecurity) {
-				addParam(params, Constants.PARAM_SECURITY, next.getValueAsQueryToken(myContext));
+				addParam(params, Constants.PARAM_SECURITY, next.getValueAsQueryToken());
 			}
 
 			for (Collection<String> profileUris : myProfiles) {
@@ -2281,7 +2281,7 @@ public OUTPUT execute() {
 
 			if (myLastUpdated != null) {
 				for (DateParam next : myLastUpdated.getValuesAsQueryTokens()) {
-					addParam(params, Constants.PARAM_LASTUPDATED, next.getValueAsQueryToken(myContext));
+					addParam(params, Constants.PARAM_LASTUPDATED, next.getValueAsQueryToken());
 				}
 			}
 
@@ -2504,7 +2504,7 @@ public StringOutcome invokeClient(
 				Map<String, List<String>> theHeaders)
 				throws IOException, BaseServerResponseException {
 
-			String payload = IOUtils.toString(theResponseInputStream, Charsets.UTF_8);
+			String payload = IOUtils.toString(theResponseInputStream, StandardCharsets.UTF_8);
 			return new StringOutcome(theResponseStatusCode, payload, theHeaders);
 		}
 	}

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirLocalContainerEntityManagerFactoryBean.java

@@ -90,9 +90,6 @@ public Map<String, Object> getJpaPropertyMap() {
 			retVal.put(BatchSettings.ORDER_UPDATES, "true");
 		}
 
-		if (!retVal.containsKey(BatchSettings.BATCH_VERSIONED_DATA)) {
-			retVal.put(BatchSettings.BATCH_VERSIONED_DATA, "true");
-		}
 		// Why is this here, you ask? LocalContainerEntityManagerFactoryBean actually clobbers the setting hibernate
 		// needs in order to be able to resolve beans, so we add it back in manually here
 		if (!retVal.containsKey(ManagedBeanSettings.BEAN_CONTAINER)) {

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirDerbyDialect.java

@@ -20,12 +20,12 @@
 package ca.uhn.fhir.jpa.model.dialect;
 
 import ca.uhn.fhir.jpa.migrate.DriverTypeEnum;
-import org.hibernate.dialect.DerbyDialect;
+import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 
 /**
  * Dialect for Derby database.
- * Minimum version: 10.14.2
+ * Minimum version: 10.15.2
  */
 public class HapiFhirDerbyDialect extends DerbyDialect implements IHapiFhirDialect {
 

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseHapiScheduler.java

@@ -280,7 +280,7 @@ private static class NonConcurrentJobDetailImpl extends JobDetailImpl {
 
 		// All HAPI FHIR jobs shouldn't allow concurrent execution
 		@Override
-		public boolean isConcurrentExectionDisallowed() {
+		public boolean isConcurrentExecutionDisallowed() {
 			return true;
 		}
 	}

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/DerbyTenSevenHapiFhirDialect.java

@@ -19,7 +19,7 @@
  */
 package ca.uhn.fhir.jpa.util;
 
-import org.hibernate.dialect.DerbyDialect;
+import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.slf4j.Logger;

hapi-fhir-jpaserver-base/pom.xml

@@ -520,29 +520,42 @@
 				<groupId>ca.uhn.hapi.fhir</groupId>
 				<artifactId>hapi-tinder-plugin</artifactId>
 				<version>${project.version}</version>
-				<executions><execution><id>generate-ddl-legacy</id>
-					<phase>process-classes</phase>
-				<goals>
-					<goal>generate-ddl</goal>
-				</goals>
-					<configuration>
-						<databasePartitionMode>false</databasePartitionMode>
-						<outputDirectory>${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database/nonpartitioned</outputDirectory>
-					</configuration>
-				</execution>
-				<execution>
-					<id>generate-ddl-partitioned</id>
-					<phase>process-classes</phase>
-				<goals>
-					<goal>generate-ddl</goal>
-				</goals>
-					<configuration>
-						<databasePartitionMode>true</databasePartitionMode>
-						<outputDirectory>${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database/partitioned</outputDirectory>
-					</configuration>
-				</execution>
+				<executions>
+					<execution>
+						<id>generate-ddl-legacy</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>generate-ddl</goal>
+						</goals>
+						<configuration>
+							<databasePartitionMode>false</databasePartitionMode>
+							<outputDirectory>${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database/nonpartitioned</outputDirectory>
+						</configuration>
+					</execution>
+					<execution>
+						<id>generate-ddl-partitioned</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>generate-ddl</goal>
+						</goals>
+						<configuration>
+							<databasePartitionMode>true</databasePartitionMode>
+							<outputDirectory>${project.build.directory}/classes/ca/uhn/hapi/fhir/jpa/docs/database/partitioned</outputDirectory>
+						</configuration>
+					</execution>
 				</executions>
 				<configuration>
+					<fileName/>
+					<package/>
+					<packageName/>
+					<packageName/>
+					<targetDirectory/>
+					<version/>
+					<fhirVersion/>
+					<configPackageBase/>
+					<packageBase/>
+					<targetResourceSpringBeansFile/>
+					<baseResourceNames/>
 					<packageNames>
 						<packageName>ca.uhn.fhir.jpa.entity</packageName>
 						<packageName>ca.uhn.fhir.jpa.model.entity</packageName>

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FulltextSearchSvcImpl.java

@@ -194,7 +194,7 @@ public ISearchQueryExecutor searchScrolled(
 			String theResourceType, SearchParameterMap theParams, RequestDetails theRequestDetails) {
 		validateHibernateSearchIsEnabled();
 
-		SearchQueryOptionsStep<?, JpaPid, SearchLoadingOptionsStep, ?, ?> searchQueryOptionsStep =
+		SearchQueryOptionsStep<?, ?, JpaPid, SearchLoadingOptionsStep, ?, ?> searchQueryOptionsStep =
 				getSearchQueryOptionsStep(theResourceType, theParams, null);
 		logQuery(searchQueryOptionsStep, theRequestDetails);
 
@@ -214,7 +214,7 @@ private ISearchQueryExecutor doSearch(
 		int count = getMaxFetchSize(theParams, theMaxResultsToFetch);
 
 		// perform an offset search instead of a scroll one, which doesn't allow for offset
-		SearchQueryOptionsStep<?, JpaPid, SearchLoadingOptionsStep, ?, ?> searchQueryOptionsStep =
+		SearchQueryOptionsStep<?, ?, JpaPid, SearchLoadingOptionsStep, ?, ?> searchQueryOptionsStep =
 				getSearchQueryOptionsStep(theResourceType, theParams, theReferencingPid);
 		logQuery(searchQueryOptionsStep, theRequestDetails);
 		List<JpaPid> longs = searchQueryOptionsStep.fetchHits(offset, count);
@@ -238,11 +238,11 @@ private int getMaxFetchSize(SearchParameterMap theParams, Integer theMax) {
 	}
 
 	@SuppressWarnings("rawtypes")
-	private SearchQueryOptionsStep<?, JpaPid, SearchLoadingOptionsStep, ?, ?> getSearchQueryOptionsStep(
+	private SearchQueryOptionsStep<?, ?, JpaPid, SearchLoadingOptionsStep, ?, ?> getSearchQueryOptionsStep(
 			String theResourceType, SearchParameterMap theParams, IResourcePersistentId theReferencingPid) {
 
 		dispatchEvent(IHSearchEventListener.HSearchEventType.SEARCH);
-		SearchQueryOptionsStep<?, JpaPid, SearchLoadingOptionsStep, ?, ?> query = getSearchSession()
+		SearchQueryOptionsStep<?, ?, JpaPid, SearchLoadingOptionsStep, ?, ?> query = getSearchSession()
 				.search(ResourceTable.class)
 				// The document id is the PK which is pid.  We use this instead of _myId to avoid fetching the doc body.
 				.select(
@@ -536,7 +536,7 @@ private CompositeProjectionOptionsStep<?, ExtendedHSearchResourceProjection> bui
 
 	@Override
 	public long count(String theResourceName, SearchParameterMap theParams) {
-		SearchQueryOptionsStep<?, JpaPid, SearchLoadingOptionsStep, ?, ?> queryOptionsStep =
+		SearchQueryOptionsStep<?, ?, JpaPid, SearchLoadingOptionsStep, ?, ?> queryOptionsStep =
 				getSearchQueryOptionsStep(theResourceName, theParams, null);
 
 		return queryOptionsStep.fetchTotalHitCount();