Skip to content

Commit 663ae3a

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/issue/301_Upgrade_Dependencies'
into develop_2
2 parents 3b7c52e + 5b2fbd2 commit 663ae3a

File tree

14 files changed

+84
-46
lines changed

14 files changed

+84
-46
lines changed

‎dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@
138138
<artifactId>xpp3_xpath</artifactId>
139139
<version>1.1.4c</version>
140140
</artifactItem>-->
141-
<artifactItem>
141+
<!--<artifactItem>
142142
<groupId>org.apache.commons</groupId>
143143
<artifactId>commons-compress</artifactId>
144-
</artifactItem>
144+
</artifactItem>-->
145145
<artifactItem>
146146
<groupId>org.fhir</groupId>
147147
<artifactId>ucum</artifactId>

‎dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<artifactItem>
183183
<groupId>net.sf.saxon</groupId>
184184
<artifactId>Saxon-HE</artifactId>
185-
<version>9.8.0-15</version>
185+
<version>11.6</version>
186186
</artifactItem>
187187
<!--<artifactItem>
188188
<groupId>org.ogce</groupId>
@@ -194,23 +194,23 @@
194194
<artifactId>jakarta-regexp</artifactId>
195195
<version>1.4</version>
196196
</artifactItem>
197-
<artifactItem>
197+
<!--<artifactItem>
198198
<groupId>org.apache.commons</groupId>
199199
<artifactId>commons-compress</artifactId>
200-
</artifactItem>
200+
</artifactItem>-->
201201
<artifactItem>
202202
<groupId>org.fhir</groupId>
203203
<artifactId>ucum</artifactId>
204-
<version>1.0.8</version>
204+
<version>1.0.9</version>
205205
</artifactItem>
206-
<artifactItem>
206+
<!--<artifactItem>
207207
<groupId>com.google.code.gson</groupId>
208208
<artifactId>gson</artifactId>
209-
</artifactItem>
209+
</artifactItem>-->
210210
<artifactItem>
211211
<groupId>com.google.errorprone</groupId>
212212
<artifactId>error_prone_annotations</artifactId>
213-
<version>2.27.0</version>
213+
<version>2.38.0</version>
214214
</artifactItem>
215215
<artifactItem>
216216
<groupId>ca.uhn.hapi.fhir</groupId>
@@ -234,7 +234,7 @@
234234
<artifactItem>
235235
<groupId>org.checkerframework</groupId>
236236
<artifactId>checker-qual</artifactId>
237-
<version>3.43.0</version>
237+
<version>3.49.3</version>
238238
</artifactItem>
239239
<artifactItem>
240240
<groupId>com.google.j2objc</groupId>
@@ -244,17 +244,17 @@
244244
<artifactItem>
245245
<groupId>io.opentelemetry</groupId>
246246
<artifactId>opentelemetry-api</artifactId>
247-
<version>1.38.0</version>
247+
<version>1.44.1</version>
248248
</artifactItem>
249249
<artifactItem>
250250
<groupId>io.opentelemetry</groupId>
251251
<artifactId>opentelemetry-context</artifactId>
252-
<version>1.38.0</version>
252+
<version>1.44.1</version>
253253
</artifactItem>
254254
<artifactItem>
255255
<groupId>io.opentelemetry.instrumentation</groupId>
256256
<artifactId>opentelemetry-instrumentation-annotations</artifactId>
257-
<version>2.4.0</version>
257+
<version>2.10.0</version>
258258
</artifactItem>
259259
<artifactItem>
260260
<groupId>org.apache.tika</groupId>

‎dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/CryptoServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void validateClientCertificate(KeyStore trustStore, Collection<? extends
157157
Objects.requireNonNull(trustStore, "trustStore");
158158
Objects.requireNonNull(certificateChain, "certificateChain");
159159

160-
CertificateValidator.vaildateClientCertificate(trustStore, certificateChain);
160+
CertificateValidator.validateClientCertificate(trustStore, certificateChain);
161161
}
162162

163163
@Override
@@ -167,7 +167,7 @@ public void validateServerCertificate(KeyStore trustStore, Collection<? extends
167167
Objects.requireNonNull(trustStore, "trustStore");
168168
Objects.requireNonNull(certificateChain, "certificateChain");
169169

170-
CertificateValidator.vaildateServerCertificate(trustStore, certificateChain);
170+
CertificateValidator.validateServerCertificate(trustStore, certificateChain);
171171
}
172172

173173
@Override

‎dsf-bpe/dsf-bpe-server-jetty/cert/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Empty `cert` directory, will contain test certificates after executing `mvn dsf:generate-dev-setup-cert-files`

‎dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ else if (!dsfServerBaseUrl.startsWith("https://"))
427427
try
428428
{
429429
X509Certificate clientCertiticate = PemReader.readCertificate(Paths.get(getDsfClientCertificateFile()));
430-
CertificateValidator.vaildateClientCertificate(getDsfClientTrustedClientCas(), clientCertiticate);
430+
CertificateValidator.validateClientCertificate(getDsfClientTrustedClientCas(), clientCertiticate);
431431
}
432432
catch (CertificateException e)
433433
{

‎dsf-bpe/dsf-bpe-server/src/main/resources/bpe/db/camunda/postgres_engine_7.22_to_7.23.sql‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--
2+
-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
3+
-- under one or more contributor license agreements. See the NOTICE file
4+
-- distributed with this work for additional information regarding copyright
5+
-- ownership. Camunda licenses this file to you under the Apache License,
6+
-- Version 2.0; you may not use this file except in compliance with the License.
7+
-- You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing, software
12+
-- distributed under the License is distributed on an "AS IS" BASIS,
13+
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
-- See the License for the specific language governing permissions and
15+
-- limitations under the License.
16+
--
17+
18+
insert into ACT_GE_SCHEMA_LOG
19+
values ('1200', CURRENT_TIMESTAMP, '7.23.0');
20+
21+
alter table ACT_HI_COMMENT
22+
add column REV_ integer not null
23+
default 1;
24+
25+
alter table ACT_RU_EXECUTION add column PROC_DEF_KEY_ varchar(255);

‎dsf-bpe/dsf-bpe-server/src/main/resources/bpe/db/db.camunda_engine.changelog-1.8.0.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<databaseChangeLog
3+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
6+
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"
7+
logicalFilePath="db/db.camunda_engine.changelog-1.8.0.xml">
8+
9+
<changeSet author="camunda.org" id="db.camunda_engine.changelog-1.8.0">
10+
<sqlFile dbms="postgresql" encoding="utf8" path="bpe/db/camunda/postgres_engine_7.22_to_7.23.sql" />
11+
</changeSet>
12+
13+
</databaseChangeLog>

‎dsf-bpe/dsf-bpe-server/src/main/resources/bpe/db/db.changelog.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@
1919
<include file="bpe/db/db.camunda_engine.changelog-1.5.1.xml" />
2020

2121
<include file="bpe/db/db.camunda_engine.changelog-1.6.0.xml" />
22+
23+
<include file="bpe/db/db.camunda_engine.changelog-1.8.0.xml" />
2224
</databaseChangeLog>

‎dsf-fhir/dsf-fhir-server-jetty/cert/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Empty `cert` directory, will contain test certificates after executing `mvn dsf:generate-dev-setup-cert-files`

‎dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/jdbc/LargeObjectManagerJdbc.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public OidAndSize create(InputStream inputStream) throws SQLException
5454
LargeObject largeObject = getLargeObjectManager(connection).open(oid);
5555
try (inputStream; OutputStream outputStream = largeObject.getOutputStream())
5656
{
57-
logger.info("Writing to large object '{}' ...", oid);
57+
logger.debug("Writing to large object '{}' ...", oid);
5858
long size = copy(inputStream, outputStream);
59-
logger.info("Writing to large object '{}' [Done, {} bytes]", oid, size);
59+
logger.debug("Writing to large object '{}' [Done, {} bytes]", oid, size);
6060

6161
return new OidAndSize(oid, size);
6262
}

0 commit comments

Comments
 (0)