Skip to content

Commit d738561

Browse files
KochTobiKochTobi
authored
Upgrade dependencies (#1366)
Co-authored-by: KochTobi <kochtobi@users.noreply.github.com>
1 parent 900bee6 commit d738561

File tree

8 files changed

+120
-40
lines changed

8 files changed

+120
-40
lines changed

‎datamanager-app/pom.xml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,34 @@
8383
<groupId>com.vaadin</groupId>
8484
<!-- Replace artifactId with vaadin-core to use only free components -->
8585
<artifactId>vaadin</artifactId>
86+
<exclusions>
87+
<exclusion>
88+
<groupId>org.apache.commons</groupId>
89+
<artifactId>commons-lang3</artifactId>
90+
</exclusion>
91+
</exclusions>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.commons</groupId>
95+
<artifactId>commons-lang3</artifactId>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.apache.commons</groupId>
99+
<artifactId>commons-fileupload2-core</artifactId>
86100
</dependency>
87101
<dependency>
88102
<groupId>com.vaadin</groupId>
89103
<artifactId>vaadin-spring-boot-starter</artifactId>
104+
<exclusions>
105+
<exclusion>
106+
<groupId>org.apache.commons</groupId>
107+
<artifactId>commons-fileupload2-core</artifactId>
108+
</exclusion>
109+
<exclusion>
110+
<groupId>org.apache.commons</groupId>
111+
<artifactId>commons-lang3</artifactId>
112+
</exclusion>
113+
</exclusions>
90114
</dependency>
91115
<dependency>
92116
<groupId>org.springframework.boot</groupId>
@@ -172,11 +196,6 @@
172196
<artifactId>spring-boot-starter-test</artifactId>
173197
<scope>test</scope>
174198
</dependency>
175-
<dependency>
176-
<groupId>com.vaadin</groupId>
177-
<artifactId>vaadin-testbench</artifactId>
178-
<scope>test</scope>
179-
</dependency>
180199
<!-- Include JUnit 4 support for TestBench and others -->
181200
<dependency>
182201
<groupId>org.junit.vintage</groupId>

‎datamanager-app/src/main/java/life/qbic/datamanager/configuration/FinancingDatasourceConfig.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.util.Map;
55
import java.util.Objects;
66
import javax.sql.DataSource;
7-
import org.apache.commons.dbcp2.BasicDataSource;
87
import org.springframework.beans.factory.annotation.Qualifier;
98
import org.springframework.beans.factory.annotation.Value;
109
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
@@ -55,7 +54,6 @@ public DataSourceProperties dataSourceProperties() {
5554
public DataSource dataSource() {
5655
return dataSourceProperties()
5756
.initializeDataSourceBuilder()
58-
.type(BasicDataSource.class)
5957
.build();
6058
}
6159

‎datamanager-app/src/main/resources/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spring.jpa.database=mysql
4848
spring.jpa.show-sql=false
4949
spring.jpa.properties.hibernate.format_sql=false
5050
# In case you want to access the H2 database (if you use one)
51-
spring.h2.console.enabled=true
51+
spring.h2.console.enabled=false
5252
# Set explicitly to false to close a session on request finish
5353
# https://www.baeldung.com/spring-open-session-in-view.
5454
spring.jpa.open-in-view=false

‎datamanager-bom/pom.xml‎

Lines changed: 71 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
<description>Bill of Materials for DataManager artifacts</description>
1212

1313
<properties>
14-
<vaadin.version>24.4.13</vaadin.version>
14+
<apache.poi.version>5.5.1</apache.poi.version>
15+
<jackson.version>2.18.3</jackson.version>
16+
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
17+
<logback.version>1.5.24</logback.version>
1518
<maven.compiler.source>21</maven.compiler.source>
1619
<maven.compiler.target>21</maven.compiler.target>
17-
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
18-
<jackson.version>2.18.3</jackson.version>
19-
<sonar.projectKey>qbicsoftware_data-manager-app</sonar.projectKey>
20-
<sonar.organization>qbicsoftware</sonar.organization>
2120
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
21+
<sonar.organization>qbicsoftware</sonar.organization>
22+
<sonar.projectKey>qbicsoftware_data-manager-app</sonar.projectKey>
23+
<vaadin.version>24.4.13</vaadin.version>
2224
</properties>
2325

2426
<distributionManagement>
@@ -129,10 +131,31 @@
129131
<type>pom</type>
130132
<scope>import</scope>
131133
</dependency>
134+
<dependency>
135+
<groupId>org.apache.commons</groupId>
136+
<artifactId>commons-fileupload2-core</artifactId>
137+
<version>2.0.0-M4</version>
138+
</dependency>
139+
<dependency>
140+
<groupId>org.apache.commons</groupId>
141+
<artifactId>commons-lang3</artifactId>
142+
<version>3.20.0</version>
143+
</dependency>
144+
<dependency>
145+
<groupId>org.apache.activemq</groupId>
146+
<artifactId>artemis-jakarta-server</artifactId>
147+
<exclusions>
148+
<exclusion>
149+
<groupId>org.apache.commons</groupId>
150+
<artifactId>commons-lang3</artifactId>
151+
</exclusion>
152+
</exclusions>
153+
<version>2.43.0</version> <!-- version 2.44 is signed differently-->
154+
</dependency>
132155
<dependency>
133156
<groupId>com.sun.mail</groupId>
134157
<artifactId>jakarta.mail</artifactId>
135-
<version>2.0.1</version>
158+
<version>2.0.2</version>
136159
</dependency>
137160
<dependency>
138161
<groupId>org.spockframework</groupId>
@@ -190,12 +213,12 @@
190213
<dependency>
191214
<groupId>commons-io</groupId>
192215
<artifactId>commons-io</artifactId>
193-
<version>2.19.0</version>
216+
<version>2.20.0</version>
194217
</dependency>
195218
<dependency>
196219
<groupId>org.apache.poi</groupId>
197220
<artifactId>poi</artifactId>
198-
<version>5.4.0</version>
221+
<version>${apache.poi.version}</version>
199222
</dependency>
200223
<dependency>
201224
<groupId>com.fasterxml.jackson.core</groupId>
@@ -205,7 +228,13 @@
205228
<dependency>
206229
<groupId>org.apache.poi</groupId>
207230
<artifactId>poi-ooxml</artifactId>
208-
<version>5.4.0</version>
231+
<version>${apache.poi.version}</version>
232+
<exclusions>
233+
<exclusion>
234+
<groupId>org.apache.commons</groupId>
235+
<artifactId>commons-lang3</artifactId>
236+
</exclusion>
237+
</exclusions>
209238
</dependency>
210239
<dependency>
211240
<groupId>net.javacrumbs.shedlock</groupId>
@@ -227,17 +256,48 @@
227256
<dependency>
228257
<groupId>org.docx4j</groupId>
229258
<artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
230-
<version>11.5.3</version>
259+
<version>11.5.9</version>
260+
<exclusions>
261+
<exclusion>
262+
<groupId>org.apache.commons</groupId>
263+
<artifactId>commons-lang3</artifactId>
264+
</exclusion>
265+
</exclusions>
266+
</dependency>
267+
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3/3.20.0 -->
268+
<dependency>
269+
<groupId>org.apache.commons</groupId>
270+
<artifactId>commons-lang3</artifactId>
271+
<version>3.20.0</version>
231272
</dependency>
232273
<dependency>
233274
<groupId>edu.kit.datamanager</groupId>
234275
<artifactId>ro-crate-java</artifactId>
235276
<version>1.1.1</version>
277+
<exclusions>
278+
<exclusion>
279+
<groupId>commons-beanutils</groupId>
280+
<artifactId>commons-beanutils</artifactId>
281+
</exclusion>
282+
</exclusions>
236283
</dependency>
284+
285+
<dependency>
286+
<groupId>commons-beanutils</groupId>
287+
<artifactId>commons-beanutils</artifactId>
288+
<version>1.11.0</version>
289+
</dependency>
290+
237291
<dependency>
238292
<groupId>org.docx4j</groupId>
239293
<artifactId>docx4j-core</artifactId>
240-
<version>11.5.0</version>
294+
<version>11.5.9</version>
295+
<exclusions>
296+
<exclusion>
297+
<groupId>org.apache.commons</groupId>
298+
<artifactId>commons-lang3</artifactId>
299+
</exclusion>
300+
</exclusions>
241301
</dependency>
242302
<dependency>
243303
<groupId>org.glassfish.jaxb</groupId>

‎identity-infrastructure/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<dependency>
2525
<groupId>org.apache.activemq</groupId>
2626
<artifactId>artemis-jakarta-server</artifactId>
27-
<version>2.41.0</version>
2827
</dependency>
2928

3029
</dependencies>

‎logging/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515
<dependency>
1616
<groupId>org.slf4j</groupId>
1717
<artifactId>slf4j-api</artifactId>
18-
<version>2.0.16</version>
18+
<version>2.0.17</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>org.slf4j</groupId>
2222
<artifactId>slf4j-simple</artifactId>
23-
<version>2.0.16</version>
23+
<version>2.0.17</version>
2424
</dependency>
2525
<!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-core -->
2626
<dependency>
2727
<groupId>ch.qos.logback</groupId>
2828
<artifactId>logback-classic</artifactId>
29-
<version>1.5.12</version>
29+
<version>${logback.version}</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>ch.qos.logback</groupId>
3333
<artifactId>logback-core</artifactId>
34-
<version>1.5.16</version>
34+
<version>${logback.version}</version>
3535
</dependency>
3636
</dependencies>
3737
</dependencyManagement>

‎pgp-keys-override.list‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ io.opencensus:*:* = 0x600EA202B1EC682F4A788E5AAC7A514BC9F9BB7
6767
xerces:xercesImpl:* = 0x6CB87B18A453990EAC9453F87D713008CC07E9AD # xercesImpl. [oai_citation:12‡Untitled.txt](file-service://file-1UbSKN5j1vX3Pe1FvyAMhb)
6868

6969
# Sigstore (your own plugin/libs)
70-
dev.sigstore:*:* = 0x2C02310024BAAE4B34976FFEAC74A3385D0E3252 # sigstore-maven-plugin / sigstore-java. [oai_citation:13‡Untitled.txt](file-service://file-1UbSKN5j1vX3Pe1FvyAMhb)
70+
dev.sigstore:*:* = 0x300b49c14dfa7e0ad9d8515400e008229f5daf37 # sigstore-maven-plugin / sigstore-java. [oai_citation:13‡Untitled.txt](file-service://file-1UbSKN5j1vX3Pe1FvyAMhb)
7171

7272
# Misc seen in log
7373
io.github.hakky54:sslcontext-kickstart:* = 0xE5138A8E9F2E7E42D38B14D99AEE152CDCCEBFCB # sslcontext-kickstart. [oai_citation:14‡Untitled.txt](file-service://file-1UbSKN5j1vX3Pe1FvyAMhb)
@@ -106,7 +106,6 @@ org.hibernate.orm:*:* = 0x1452F35849B50750F6A3BBB4B54011358B352F85
106106
# --- Apache ActiveMQ Artemis (many modules in your log) ---
107107
org.apache.activemq:*:* = 0x28417C95E8906D108392822354A43F3254868410
108108

109-
110109
# --- JGroups (unsigned in Maven Central) ---
111110
org.jgroups:jgroups:* = noSig
112111
org.jgroups:jgroups:*:pom = noSig
@@ -225,8 +224,8 @@ org.jboss.forge.roaster:roaster-jdt:2.29.0.Final:pom = 0x001A438334F162E6AFB27F3
225224
# Misc seen in the log
226225
io.methvin:directory-watcher:0.18.0 = 0xAEE8A343247713A5A198640D4D1670765EF90EAB
227226
io.methvin:directory-watcher:0.18.0:pom = 0xAEE8A343247713A5A198640D4D1670765EF90EAB
228-
org.mariadb.jdbc:mariadb-java-client:3.5.6 = 0x4C470FFFEFC4D3DC59778655CE1A3DD5E3C94F49
229-
org.mariadb.jdbc:mariadb-java-client:3.5.6:pom = 0x4C470FFFEFC4D3DC59778655CE1A3DD5E3C94F49
227+
org.mariadb.jdbc:mariadb-java-client:3.5.7 = 0x4C470FFFEFC4D3DC59778655CE1A3DD5E3C94F49
228+
org.mariadb.jdbc:mariadb-java-client:3.5.7:pom = 0x4C470FFFEFC4D3DC59778655CE1A3DD5E3C94F49
230229
com.helger.commons:ph-commons:11.1.5 = 0x670BE7D076A0C89F5F07625AE57428DA9E879E7D
231230
com.helger.commons:ph-commons:11.1.5:pom = 0x670BE7D076A0C89F5F07625AE57428DA9E879E7D
232231
org.tomlj:tomlj:1.0.0 = 0x80F6D6B0D90C6747753344CAB5A9E81B565E89E0

‎pom.xml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,29 @@
3636
</modules>
3737
<packaging>pom</packaging>
3838

39+
40+
<parent>
41+
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent -->
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-starter-parent</artifactId>
44+
<version>3.5.9</version>
45+
</parent>
46+
47+
3948
<properties>
49+
<apache.poi.version>5.5.1</apache.poi.version>
50+
<jackson.version>2.18.3</jackson.version>
51+
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
4052
<java.version>21</java.version>
41-
<vaadin.version>24.4.13</vaadin.version>
53+
<logback.version>1.5.24</logback.version>
4254
<maven.compiler.source>21</maven.compiler.source>
4355
<maven.compiler.target>21</maven.compiler.target>
44-
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
45-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
46-
<jackson.version>2.18.3</jackson.version>
47-
<sonar.projectKey>qbicsoftware_data-manager-app</sonar.projectKey>
48-
<sonar.organization>qbicsoftware</sonar.organization>
4956
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
57+
<sonar.organization>qbicsoftware</sonar.organization>
58+
<sonar.projectKey>qbicsoftware_data-manager-app</sonar.projectKey>
59+
<vaadin.version>24.4.13</vaadin.version>
5060
</properties>
5161

52-
<parent>
53-
<groupId>org.springframework.boot</groupId>
54-
<artifactId>spring-boot-starter-parent</artifactId>
55-
<version>3.5.6</version>
56-
</parent>
5762

5863
<repositories>
5964
<!-- The order of definitions matters. Explicitly defining central here to make sure it has the highest priority. -->
@@ -243,7 +248,7 @@
243248
<plugin>
244249
<groupId>dev.sigstore</groupId>
245250
<artifactId>sigstore-maven-plugin</artifactId>
246-
<version>1.3.0</version>
251+
<version>2.0.0</version>
247252
<executions>
248253
<execution>
249254
<id>sigstore-sign</id>

0 commit comments

Comments
 (0)