diff --git a/datamanager-app/pom.xml b/datamanager-app/pom.xml index ceaab0707..0fd8cfc65 100644 --- a/datamanager-app/pom.xml +++ b/datamanager-app/pom.xml @@ -83,10 +83,34 @@ com.vaadin vaadin + + + org.apache.commons + commons-lang3 + + + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-fileupload2-core com.vaadin vaadin-spring-boot-starter + + + org.apache.commons + commons-fileupload2-core + + + org.apache.commons + commons-lang3 + + org.springframework.boot @@ -172,11 +196,6 @@ spring-boot-starter-test test - - com.vaadin - vaadin-testbench - test - org.junit.vintage diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/configuration/FinancingDatasourceConfig.java b/datamanager-app/src/main/java/life/qbic/datamanager/configuration/FinancingDatasourceConfig.java index 3d783e820..de4826baa 100644 --- a/datamanager-app/src/main/java/life/qbic/datamanager/configuration/FinancingDatasourceConfig.java +++ b/datamanager-app/src/main/java/life/qbic/datamanager/configuration/FinancingDatasourceConfig.java @@ -4,7 +4,6 @@ import java.util.Map; import java.util.Objects; import javax.sql.DataSource; -import org.apache.commons.dbcp2.BasicDataSource; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; @@ -55,7 +54,6 @@ public DataSourceProperties dataSourceProperties() { public DataSource dataSource() { return dataSourceProperties() .initializeDataSourceBuilder() - .type(BasicDataSource.class) .build(); } diff --git a/datamanager-app/src/main/resources/application.properties b/datamanager-app/src/main/resources/application.properties index e9ecd26a1..5ef08f9f3 100644 --- a/datamanager-app/src/main/resources/application.properties +++ b/datamanager-app/src/main/resources/application.properties @@ -48,7 +48,7 @@ spring.jpa.database=mysql spring.jpa.show-sql=false spring.jpa.properties.hibernate.format_sql=false # In case you want to access the H2 database (if you use one) -spring.h2.console.enabled=true +spring.h2.console.enabled=false # Set explicitly to false to close a session on request finish # https://www.baeldung.com/spring-open-session-in-view. spring.jpa.open-in-view=false diff --git a/datamanager-bom/pom.xml b/datamanager-bom/pom.xml index 1e40b4cbe..74c2061a1 100644 --- a/datamanager-bom/pom.xml +++ b/datamanager-bom/pom.xml @@ -11,14 +11,16 @@ Bill of Materials for DataManager artifacts - 24.4.13 + 5.5.1 + 2.18.3 + 3.2.0 + 1.5.24 21 21 - 3.2.0 - 2.18.3 - qbicsoftware_data-manager-app - qbicsoftware https://sonarcloud.io + qbicsoftware + qbicsoftware_data-manager-app + 24.4.13 @@ -129,10 +131,31 @@ pom import + + org.apache.commons + commons-fileupload2-core + 2.0.0-M4 + + + org.apache.commons + commons-lang3 + 3.20.0 + + + org.apache.activemq + artemis-jakarta-server + + + org.apache.commons + commons-lang3 + + + 2.43.0 + com.sun.mail jakarta.mail - 2.0.1 + 2.0.2 org.spockframework @@ -190,12 +213,12 @@ commons-io commons-io - 2.19.0 + 2.20.0 org.apache.poi poi - 5.4.0 + ${apache.poi.version} com.fasterxml.jackson.core @@ -205,7 +228,13 @@ org.apache.poi poi-ooxml - 5.4.0 + ${apache.poi.version} + + + org.apache.commons + commons-lang3 + + net.javacrumbs.shedlock @@ -227,17 +256,48 @@ org.docx4j docx4j-JAXB-ReferenceImpl - 11.5.3 + 11.5.9 + + + org.apache.commons + commons-lang3 + + + + + + org.apache.commons + commons-lang3 + 3.20.0 edu.kit.datamanager ro-crate-java 1.1.1 + + + commons-beanutils + commons-beanutils + + + + + commons-beanutils + commons-beanutils + 1.11.0 + + org.docx4j docx4j-core - 11.5.0 + 11.5.9 + + + org.apache.commons + commons-lang3 + + org.glassfish.jaxb diff --git a/identity-infrastructure/pom.xml b/identity-infrastructure/pom.xml index 7f14fa8a5..6b8e82508 100644 --- a/identity-infrastructure/pom.xml +++ b/identity-infrastructure/pom.xml @@ -24,7 +24,6 @@ org.apache.activemq artemis-jakarta-server - 2.41.0 diff --git a/logging/pom.xml b/logging/pom.xml index b75eeb99e..9551d3588 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -15,23 +15,23 @@ org.slf4j slf4j-api - 2.0.16 + 2.0.17 org.slf4j slf4j-simple - 2.0.16 + 2.0.17 ch.qos.logback logback-classic - 1.5.12 + ${logback.version} ch.qos.logback logback-core - 1.5.16 + ${logback.version} diff --git a/pgp-keys-override.list b/pgp-keys-override.list index d46b29e28..650e7e1e8 100644 --- a/pgp-keys-override.list +++ b/pgp-keys-override.list @@ -67,7 +67,7 @@ io.opencensus:*:* = 0x600EA202B1EC682F4A788E5AAC7A514BC9F9BB7 xerces:xercesImpl:* = 0x6CB87B18A453990EAC9453F87D713008CC07E9AD # xercesImpl. [oai_citation:12‡Untitled.txt](file-service://file-1UbSKN5j1vX3Pe1FvyAMhb) # Sigstore (your own plugin/libs) -dev.sigstore:*:* = 0x2C02310024BAAE4B34976FFEAC74A3385D0E3252 # sigstore-maven-plugin / sigstore-java. [oai_citation:13‡Untitled.txt](file-service://file-1UbSKN5j1vX3Pe1FvyAMhb) +dev.sigstore:*:* = 0x300b49c14dfa7e0ad9d8515400e008229f5daf37 # sigstore-maven-plugin / sigstore-java. [oai_citation:13‡Untitled.txt](file-service://file-1UbSKN5j1vX3Pe1FvyAMhb) # Misc seen in log 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 # --- Apache ActiveMQ Artemis (many modules in your log) --- org.apache.activemq:*:* = 0x28417C95E8906D108392822354A43F3254868410 - # --- JGroups (unsigned in Maven Central) --- org.jgroups:jgroups:* = noSig org.jgroups:jgroups:*:pom = noSig @@ -225,8 +224,8 @@ org.jboss.forge.roaster:roaster-jdt:2.29.0.Final:pom = 0x001A438334F162E6AFB27F3 # Misc seen in the log io.methvin:directory-watcher:0.18.0 = 0xAEE8A343247713A5A198640D4D1670765EF90EAB io.methvin:directory-watcher:0.18.0:pom = 0xAEE8A343247713A5A198640D4D1670765EF90EAB -org.mariadb.jdbc:mariadb-java-client:3.5.6 = 0x4C470FFFEFC4D3DC59778655CE1A3DD5E3C94F49 -org.mariadb.jdbc:mariadb-java-client:3.5.6:pom = 0x4C470FFFEFC4D3DC59778655CE1A3DD5E3C94F49 +org.mariadb.jdbc:mariadb-java-client:3.5.7 = 0x4C470FFFEFC4D3DC59778655CE1A3DD5E3C94F49 +org.mariadb.jdbc:mariadb-java-client:3.5.7:pom = 0x4C470FFFEFC4D3DC59778655CE1A3DD5E3C94F49 com.helger.commons:ph-commons:11.1.5 = 0x670BE7D076A0C89F5F07625AE57428DA9E879E7D com.helger.commons:ph-commons:11.1.5:pom = 0x670BE7D076A0C89F5F07625AE57428DA9E879E7D org.tomlj:tomlj:1.0.0 = 0x80F6D6B0D90C6747753344CAB5A9E81B565E89E0 diff --git a/pom.xml b/pom.xml index 6d6d025ff..9762e4bf4 100644 --- a/pom.xml +++ b/pom.xml @@ -36,24 +36,29 @@ pom + + + + org.springframework.boot + spring-boot-starter-parent + 3.5.9 + + + + 5.5.1 + 2.18.3 + 3.2.0 21 - 24.4.13 + 1.5.24 21 21 - 3.2.0 - UTF-8 - 2.18.3 - qbicsoftware_data-manager-app - qbicsoftware https://sonarcloud.io + qbicsoftware + qbicsoftware_data-manager-app + 24.4.13 - - org.springframework.boot - spring-boot-starter-parent - 3.5.6 - @@ -243,7 +248,7 @@ dev.sigstore sigstore-maven-plugin - 1.3.0 + 2.0.0 sigstore-sign