honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge eb1704e1a3 into ef78b46621

This commit is contained in:
Michele Adduci 2024-11-08 04:28:18 +00:00 committed by GitHub
parent ef78b46621 eb1704e1a3
commit d68cebe21b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 125 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/changes.yaml
View File

@ -5,4 +5,40 @@
(dependent HAPI modules listed in brackets):
<ul>
<li>org.hl7.fhir.core (Base): 6.3.25 -&gt; 6.4.0</li>
<li>spring-boot-bom (Base): 3.2.6 -&gt; 3.3.5</li>
<li>spring-retry (Base): 2.0.6 -&gt; 2.0.10</li>
<li>spring-data-bom (Base): 2023.1.6 -&gt; 2024.0.5</li>
<li>spring (Base): 6.1.8 -&gt; 6.1.14</li>
<li>slf4j-api (Base): 2.0.13 -&gt; 2.0.16</li>
<li>log4j-to-slf4j (Base): 2.19.0 -&gt; 2.24.1</li>
<li>jackson (Base): 2.17.1 -&gt; 2.18.1</li>
<li>jackson-databind (Base): 2.17.1 -&gt; 2.18.1</li>
<li>opentelemetry-instrumentation-bom (Base): 2.8.0 -&gt; 2.9.0</li>
<li>resteasy (Base): 6.2.9.Final -&gt; 6.2.10.Final</li>
<li>logback-classic (Base): 1.4.14 -&gt; 1.5.12</li>
<li>owasp-java-html-sanitizer (Base): 20211018.2 -&gt; 20240325.1</li>
<li>graphql-java (Base): 21.5 -&gt; 22.3</li>
<li>simple-java-mail (Base): 8.11.2 -&gt; 8.12.2</li>
<li>okio-jvm (Base): 3.4.0 -&gt; 3.9.1</li>
<li>commons-cli (Base): 1.5.0 -&gt; 1.9.0</li>
<li>org.jetbrains.annotations (Base): 23.0.0 -&gt; 26.0.1</li>
<li>xmlunit-core (Base): 2.4.0 -&gt; 2.10.0</li>
<li>jboss-logging (Tinder): 3.4.2.Final -&gt; 3.6.1.Final</li>
<li>springdoc-openapi-starter-webmvc-ui (Server): 2.2.0 -&gt; 2.6.0</li>
<li>ace-builds (Server): 1.22.0 -&gt; 1.36.3</li>
<li>bootstrap (Server): 4.5.2 -&gt; 4.6.2</li>
<li>Eonasdan-bootstrap-datetimepicker (Server): 4.17.47 -&gt; 4.17.49</li>
<li>font-awesome (Server): 5.8.2 -&gt; 5.15.4</li>
<li>swagger-ui (Server): 4.1.3 -&gt; 4.19.1</li>
<li>httpcore (Client): 4.4.13 -&gt; 4.4.16</li>
<li>httpclient (Client): 4.5.13 -&gt; 4.5.14</li>
<li>flyway (JPA): 9.4.0 -&gt; 10.20.1</li>
<li>hibernate (JPA): 6.4.1.Final -&gt; 6.6.2.Final</li>
<li>hibernate-search (JPA): 7.0.0.Final -&gt; 7.2.1.Final</li>
<li>elastic-apm (JPA): 1.44.0 -&gt; 1.52.0</li>
<li>elastic-search (JPA): 8.14.3 -&gt; 8.15.3</li>
<li>lucene (JPA): 9.8.0 -&gt; 9.12.0</li>
<li>postgresql (JPA): 42.7.3 -&gt; 42.7.4</li>
<li>mysql-connector-j (JPA): 8.2.0 -&gt; 9.1.0</li>
<li>ojdbc11 (JPA): 23.3.0.23.09 -&gt; 23.6.0.24.10</li>
</ul>"

3
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/upgrade.md
View File

@ -0,0 +1,3 @@
## Entities annotations
The `@Embedded` Annotation is no longer allowed, in presences of the `@Entity` one.

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java
View File

@ -150,6 +150,6 @@ public interface IBatch2WorkChunkRepository
@Param("status") WorkChunkStatusEnum theStatus);
@Query(
"SELECT new ca.uhn.fhir.batch2.model.BatchWorkChunkStatusDTO(e.myTargetStepId, e.myStatus, min(e.myStartTime), max(e.myEndTime), avg(e.myEndTime - e.myStartTime), count(*)) FROM Batch2WorkChunkEntity e WHERE e.myInstanceId=:instanceId GROUP BY e.myTargetStepId, e.myStatus")
"SELECT new ca.uhn.fhir.batch2.model.BatchWorkChunkStatusDTO(e.myTargetStepId, e.myStatus, min(e.myStartTime), max(e.myEndTime), avg(cast((e.myEndTime - e.myStartTime) as long)), count(*)) FROM Batch2WorkChunkEntity e WHERE e.myInstanceId=:instanceId GROUP BY e.myTargetStepId, e.myStatus")
List<BatchWorkChunkStatusDTO> fetchWorkChunkStatusForInstance(@Param("instanceId") String theInstanceId);
}

24
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java
View File

@ -20,9 +20,11 @@
package ca.uhn.fhir.jpa.dao.search;
import jakarta.annotation.Nonnull;
import org.hibernate.search.engine.search.common.NamedValues;
import org.hibernate.search.engine.search.predicate.SearchPredicate;
import org.hibernate.search.engine.search.predicate.dsl.BooleanPredicateClausesStep;
import org.hibernate.search.engine.search.predicate.dsl.ExistsPredicateFieldStep;
import org.hibernate.search.engine.search.predicate.dsl.KnnPredicateFieldStep;
import org.hibernate.search.engine.search.predicate.dsl.MatchAllPredicateOptionsStep;
import org.hibernate.search.engine.search.predicate.dsl.MatchIdPredicateMatchingStep;
import org.hibernate.search.engine.search.predicate.dsl.MatchNonePredicateFinalStep;
@ -34,6 +36,8 @@ import org.hibernate.search.engine.search.predicate.dsl.NestedPredicateOptionsSt
import org.hibernate.search.engine.search.predicate.dsl.NotPredicateFinalStep;
import org.hibernate.search.engine.search.predicate.dsl.PhrasePredicateFieldStep;
import org.hibernate.search.engine.search.predicate.dsl.PredicateFinalStep;
import org.hibernate.search.engine.search.predicate.dsl.PrefixPredicateFieldStep;
import org.hibernate.search.engine.search.predicate.dsl.QueryStringPredicateFieldStep;
import org.hibernate.search.engine.search.predicate.dsl.RangePredicateFieldStep;
import org.hibernate.search.engine.search.predicate.dsl.RegexpPredicateFieldStep;
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
@ -221,6 +225,11 @@ class PathContext implements SearchPredicateFactory {
return myPredicateFactory.wildcard();
}
@Override
public PrefixPredicateFieldStep<?> prefix() {
return myPredicateFactory.prefix();
}
@Override
public RegexpPredicateFieldStep<?> regexp() {
return myPredicateFactory.regexp();
@ -246,6 +255,11 @@ class PathContext implements SearchPredicateFactory {
return myPredicateFactory.simpleQueryString();
}
@Override
public QueryStringPredicateFieldStep<?> queryString() {
return myPredicateFactory.queryString();
}
@Override
public ExistsPredicateFieldStep<?> exists() {
return myPredicateFactory.exists();
@ -262,6 +276,16 @@ class PathContext implements SearchPredicateFactory {
return myPredicateFactory.named(path);
}
@Override
public KnnPredicateFieldStep knn(int i) {
return myPredicateFactory.knn(i);
}
@Override
public PredicateFinalStep withParameters(Function<? super NamedValues, ? extends PredicateFinalStep> function) {
return myPredicateFactory.withParameters(function);
}
@Override
public <T> T extension(SearchPredicateFactoryExtension<T> extension) {
return myPredicateFactory.extension(extension);

11
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java
View File

@ -33,6 +33,8 @@ import ca.uhn.fhir.util.StringUtil;
import ca.uhn.fhir.util.VersionUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonSerializer;
import graphql.ExecutionResult;
import graphql.GraphQL;
import graphql.language.InterfaceTypeDefinition;
@ -80,6 +82,7 @@ public class GraphQLProviderWithIntrospection extends GraphQLProvider {
private final ISearchParamRegistry mySearchParamRegistry;
private final VersionSpecificWorkerContextWrapper myContext;
private final IDaoRegistry myDaoRegistry;
private final Gson myGson;
/**
* Constructor
@ -97,6 +100,11 @@ public class GraphQLProviderWithIntrospection extends GraphQLProvider {
myContext = VersionSpecificWorkerContextWrapper.newVersionSpecificWorkerContextWrapper(theValidationSupport);
myGenerator = new GraphQLSchemaGenerator(myContext, VersionUtil.getVersion());
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.registerTypeAdapter(Collections.emptyList().getClass(), (JsonSerializer<Object>)
(src, typeOfSrc, context) -> new JsonArray());
myGson = gsonBuilder.create();
}
@Override
@ -250,8 +258,7 @@ public class GraphQLProviderWithIntrospection extends GraphQLProvider {
ExecutionResult executionResult = build.execute(theQueryBody);
Map<String, Object> data = executionResult.toSpecification();
Gson gson = new GsonBuilder().create();
return gson.toJson(data);
return myGson.toJson(data);
}
@Nonnull

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java
View File

@ -20,7 +20,6 @@
package ca.uhn.fhir.jpa.model.entity;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
import jakarta.persistence.GeneratedValue;
@ -35,7 +34,6 @@ import org.hibernate.annotations.GenericGenerator;
import java.io.Serializable;
@Embeddable
@Entity
@Table(
name = "HFJ_HISTORY_TAG",

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java
View File

@ -24,7 +24,6 @@ import ca.uhn.fhir.jpa.model.listener.IndexStorageOptimizationListener;
import ca.uhn.fhir.model.api.IQueryParameterType;
import jakarta.annotation.Nullable;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.FetchType;
@ -42,7 +41,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.hibernate.annotations.GenericGenerator;
@Embeddable
@EntityListeners(IndexStorageOptimizationListener.class)
@Entity
@Table(

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java
View File

@ -28,7 +28,6 @@ import ca.uhn.fhir.rest.param.DateParam;
import ca.uhn.fhir.rest.param.DateRangeParam;
import ca.uhn.fhir.util.DateUtils;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.FetchType;
@ -56,7 +55,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@Embeddable
@EntityListeners(IndexStorageOptimizationListener.class)
@Entity
@Table(

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java
View File

@ -24,7 +24,6 @@ import ca.uhn.fhir.jpa.model.listener.IndexStorageOptimizationListener;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.rest.param.NumberParam;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.FetchType;
@ -48,7 +47,6 @@ import org.hibernate.type.SqlTypes;
import java.math.BigDecimal;
import java.util.Objects;
@Embeddable
@EntityListeners(IndexStorageOptimizationListener.class)
@Entity
@Table(

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java
View File

@ -24,7 +24,6 @@ import ca.uhn.fhir.jpa.model.listener.IndexStorageOptimizationListener;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.rest.param.QuantityParam;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.FetchType;
@ -50,7 +49,6 @@ import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.isBlank;
// @formatter:off
@Embeddable
@EntityListeners(IndexStorageOptimizationListener.class)
@Entity
@Table(

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java
View File

@ -25,7 +25,6 @@ import ca.uhn.fhir.jpa.model.util.UcumServiceUtil;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.rest.param.QuantityParam;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.FetchType;
@ -52,7 +51,6 @@ import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.isBlank;
// @formatter:off
@Embeddable
@EntityListeners(IndexStorageOptimizationListener.class)
@Entity
@Table(

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java
View File

@ -27,7 +27,6 @@ import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.rest.param.StringParam;
import ca.uhn.fhir.util.StringUtil;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.ForeignKey;
@ -48,7 +47,6 @@ import static ca.uhn.fhir.jpa.model.util.SearchParamHash.hashSearchParam;
import static org.apache.commons.lang3.StringUtils.defaultString;
// @formatter:off
@Embeddable
@EntityListeners(IndexStorageOptimizationListener.class)
@Entity
@Table(

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java
View File

@ -26,7 +26,6 @@ import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.rest.api.Constants;
import ca.uhn.fhir.rest.param.TokenParam;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.FetchType;
@ -52,7 +51,6 @@ import static ca.uhn.fhir.jpa.model.util.SearchParamHash.hashSearchParam;
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.trim;
@Embeddable
@EntityListeners(IndexStorageOptimizationListener.class)
@Entity
@Table(

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java
View File

@ -25,7 +25,6 @@ import ca.uhn.fhir.jpa.model.listener.IndexStorageOptimizationListener;
import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.rest.param.UriParam;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.FetchType;
@ -47,7 +46,6 @@ import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextFi
import static ca.uhn.fhir.jpa.model.util.SearchParamHash.hashSearchParam;
import static org.apache.commons.lang3.StringUtils.defaultString;
@Embeddable
@EntityListeners(IndexStorageOptimizationListener.class)
@Entity
@Table(

12
hapi-fhir-sql-migrate/pom.xml
View File

@ -54,13 +54,13 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
<version>10.16.1.1</version>
<version>10.17.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
<version>10.16.1.1</version>
<version>10.17.1.0</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
@ -80,13 +80,6 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-test-utilities</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
@ -131,7 +124,6 @@
</dependency>
<!-- test -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-test-utilities</artifactId>

89
pom.xml
View File

@ -957,6 +957,11 @@
<name>Ibrahim</name>
<organization>Trifork A/S</organization>
</developer>
<developer>
<id>madduci</id>
<name>Michele Adduci</name>
<organization>gematik GmbH</organization>
</developer>
</developers>
<licenses>
@ -1013,53 +1018,54 @@
<jaxb_runtime_version>4.0.4</jaxb_runtime_version>
<jena_version>4.9.0</jena_version>
<jersey_version>3.0.3</jersey_version>
<jetty_version>12.0.9</jetty_version>
<jetty_version>12.0.15</jetty_version>
<jsr305_version>3.0.2</jsr305_version>
<junit_version>5.10.1</junit_version>
<flexmark_version>0.64.8</flexmark_version>
<flyway_version>9.4.0</flyway_version>
<hibernate_version>6.4.1.Final</hibernate_version>
<logback_version>1.4.14</logback_version>
<flyway_version>10.20.1</flyway_version>
<hibernate_version>6.6.2.Final</hibernate_version>
<logback_version>1.5.12</logback_version>
<!-- Update lucene version when you update hibernate-search version - These go together! -->
<hibernate_search_version>7.0.0.Final</hibernate_search_version>
<hibernate_search_version>7.2.1.Final</hibernate_search_version>
<!-- Update lucene version when you update hibernate-search version - These go together! -->
<lucene_version>9.8.0</lucene_version>
<lucene_version>9.12.0</lucene_version>
<hamcrest_version>2.2</hamcrest_version>
<hibernate_validator_version>8.0.0.Final</hibernate_validator_version>
<httpcore_version>4.4.13</httpcore_version>
<httpclient_version>4.5.13</httpclient_version>
<jackson_version>2.17.1</jackson_version>
<jackson_databind_version>2.17.1</jackson_databind_version>
<httpcore_version>4.4.16</httpcore_version>
<httpclient_version>4.5.14</httpclient_version>
<jackson_version>2.18.1</jackson_version>
<jackson_databind_version>2.18.1</jackson_databind_version>
<maven_assembly_plugin_version>3.3.0</maven_assembly_plugin_version>
<maven_license_plugin_version>1.8</maven_license_plugin_version>
<okhttp_version>4.12.0</okhttp_version>
<otel_instrumentation.version>2.8.0</otel_instrumentation.version>
<otel_instrumentation.version>2.9.0</otel_instrumentation.version>
<poi_version>4.1.2</poi_version>
<poi_ooxml_schemas_version>1.4</poi_ooxml_schemas_version>
<resteasy_version>6.2.9.Final</resteasy_version>
<resteasy_version>6.2.10.Final</resteasy_version>
<ph_schematron_version>7.1.2</ph_schematron_version>
<ph_commons_version>9.5.4</ph_commons_version>
<plexus_compiler_api_version>2.13.0</plexus_compiler_api_version>
<reflections_version>0.9.11</reflections_version>
<servicemix_saxon_version>9.8.0-15</servicemix_saxon_version>
<servicemix_xmlresolver_version>1.2_5</servicemix_xmlresolver_version>
<swagger_version>2.2.22</swagger_version>
<slf4j_version>2.0.13</slf4j_version>
<log4j_to_slf4j_version>2.19.0</log4j_to_slf4j_version>
<spring_version>6.1.8</spring_version>
<spring_data_bom_version>2023.1.6</spring_data_bom_version>
<swagger_version>2.2.25</swagger_version>
<slf4j_version>2.0.16</slf4j_version>
<log4j_to_slf4j_version>2.24.1</log4j_to_slf4j_version>
<spring_version>6.1.14</spring_version>
<spring_data_bom_version>2024.0.5</spring_data_bom_version>
<spring_batch_version>4.3.10</spring_batch_version>
<spring_boot_version>3.2.6</spring_boot_version>
<spring_retry_version>2.0.6</spring_retry_version>
<spring_boot_version>3.3.5</spring_boot_version>
<spring_retry_version>2.0.10</spring_retry_version>
<json_path_version>2.9.0</json_path_version>
<jboss_logging_version>3.6.1.Final</jboss_logging_version>
<stax2_api_version>3.1.4</stax2_api_version>
<testcontainers_version>1.19.3</testcontainers_version>
<testcontainers_version>1.20.3</testcontainers_version>
<thymeleaf-version>3.1.2.RELEASE</thymeleaf-version>
<woodstox_core_asl_version>4.4.1</woodstox_core_asl_version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
<elastic_apm_version>1.44.0</elastic_apm_version>
<elasticsearch_version>8.14.3</elasticsearch_version>
<elastic_apm_version>1.52.0</elastic_apm_version>
<elasticsearch_version>8.15.3</elasticsearch_version>
<ucum_version>1.0.8</ucum_version>
<!-- Clinical Reasoning & CQL Support -->
@ -1114,6 +1120,11 @@
<artifactId>logback-core</artifactId>
<version>${logback_version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss_logging_version}</version>
</dependency>
<dependency>
<groupId>com.atlassian.commonmark</groupId>
<artifactId>commonmark</artifactId>
@ -1167,18 +1178,18 @@
<dependency>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
<artifactId>owasp-java-html-sanitizer</artifactId>
<version>20211018.2</version>
<version>20240325.1</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java</artifactId>
<version>21.5</version>
<version>22.3</version>
</dependency>
<!-- mail start -->
<dependency>
<groupId>org.simplejavamail</groupId>
<artifactId>simple-java-mail</artifactId>
<version>8.11.2</version>
<version>8.12.2</version>
<exclusions>
<exclusion>
<groupId>com.github.bbottema</groupId>
@ -1277,14 +1288,14 @@
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<version>3.4.0</version>
<version>3.9.1</version>
</dependency>
<!-- Architecture Test -->
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit5</artifactId>
<version>1.0.1</version>
<version>1.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -1310,7 +1321,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.5.0</version>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@ -1355,7 +1366,7 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>23.0.0</version>
<version>26.0.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@ -1486,12 +1497,12 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.2.0</version>
<version>9.1.0</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.2.0</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
@ -2023,12 +2034,12 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.3</version>
<version>42.7.4</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>23.3.0.23.09</version>
<version>23.6.0.24.10</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
@ -2167,17 +2178,17 @@
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>ace-builds</artifactId>
<version>1.22.0</version>
<version>1.36.3</version>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>bootstrap</artifactId>
<version>4.5.2</version>
<version>4.6.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>Eonasdan-bootstrap-datetimepicker</artifactId>
<version>4.17.47</version>
<version>4.17.49</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@ -2188,7 +2199,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>5.8.2</version>
<version>5.15.4</version>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
@ -2229,12 +2240,12 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
<version>4.1.3</version>
<version>4.19.1</version>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>2.4.0</version>
<version>2.10.0</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>