diff --git a/bitrepository-alarm-service/pom.xml b/bitrepository-alarm-service/pom.xml index ece1198d3..34df1f05a 100644 --- a/bitrepository-alarm-service/pom.xml +++ b/bitrepository-alarm-service/pom.xml @@ -46,9 +46,9 @@ ${jackson.version} - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} org.bitrepository.reference diff --git a/bitrepository-audit-trail-service/pom.xml b/bitrepository-audit-trail-service/pom.xml index 18d60875f..bb98bf632 100644 --- a/bitrepository-audit-trail-service/pom.xml +++ b/bitrepository-audit-trail-service/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 bitrepository-parent @@ -43,9 +44,9 @@ ${jackson.version} - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} javax diff --git a/bitrepository-core/pom.xml b/bitrepository-core/pom.xml index 8a6f48adb..a397a265e 100644 --- a/bitrepository-core/pom.xml +++ b/bitrepository-core/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.bitrepository.reference @@ -24,7 +25,7 @@ org.bitrepository.repository-settings bitrepository-repository-settings-java ${repository.settings.version} - + org.bitrepository bitrepository-message-xml-xsd @@ -43,17 +44,17 @@ org.apache.httpcomponents httpclient - 4.5.12 + 4.5.13 org.bouncycastle bcprov-jdk15on - 1.65 + 1.70 org.bouncycastle bcmail-jdk15on - 1.65 + 1.70 org.apache.activemq @@ -74,7 +75,7 @@ org.eclipse.jetty jetty-server - 9.4.35.v20201120 + 11.0.8 test diff --git a/bitrepository-integration/src/main/resources/quickstart/scripts/quickstart.sh b/bitrepository-integration/src/main/resources/quickstart/scripts/quickstart.sh index 9179a5916..c0c6b468f 100644 --- a/bitrepository-integration/src/main/resources/quickstart/scripts/quickstart.sh +++ b/bitrepository-integration/src/main/resources/quickstart/scripts/quickstart.sh @@ -38,7 +38,7 @@ export CATALINA_PID="${quickstartdir}/tomcat/pid.tomcat" # Function that starts the quickstart components # do_start() { - export CATALINA_OPTS="-Xms256m -Xmx1028m -XX:PermSize=256m -XX:MaxPermSize=256m" + export CATALINA_OPTS="-Xms256m -Xmx1028m" ${quickstartdir}/file1pillar/bin/pillar.sh start ${quickstartdir}/file2pillar/bin/pillar.sh start ${quickstartdir}/checksumpillar/bin/pillar.sh start diff --git a/bitrepository-integrity-service/pom.xml b/bitrepository-integrity-service/pom.xml index 009469141..b10f6930e 100644 --- a/bitrepository-integrity-service/pom.xml +++ b/bitrepository-integrity-service/pom.xml @@ -47,9 +47,9 @@ ${jackson.version} - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} org.bitrepository.reference diff --git a/bitrepository-monitoring-service/pom.xml b/bitrepository-monitoring-service/pom.xml index a18d7f3c7..9ecb37b2f 100644 --- a/bitrepository-monitoring-service/pom.xml +++ b/bitrepository-monitoring-service/pom.xml @@ -46,9 +46,9 @@ ${jackson.version} - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} diff --git a/bitrepository-service/pom.xml b/bitrepository-service/pom.xml index a603ef0cf..1c3c30805 100644 --- a/bitrepository-service/pom.xml +++ b/bitrepository-service/pom.xml @@ -39,7 +39,7 @@ org.postgresql postgresql - 42.2.14 + 42.3.3 com.mchange diff --git a/bitrepository-webclient/pom.xml b/bitrepository-webclient/pom.xml index e9d4674df..cdee05815 100644 --- a/bitrepository-webclient/pom.xml +++ b/bitrepository-webclient/pom.xml @@ -44,9 +44,9 @@ ${jackson.version} - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.version} org.bitrepository.reference @@ -90,8 +90,5 @@ - - ${project.build.directory}/endorsed - diff --git a/pom.xml b/pom.xml index 82c48e02c..1a98b429e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ http://en.statsbiblioteket.dk - Kim Teglgaard Christensen + Kim Teglgaard Christensen ktc@statsbiblioteket.dk The Danish State and University Library http://en.statsbiblioteket.dk @@ -126,30 +126,35 @@ + (sort of described here: https://github.com/highsource/jaxb2-basics/issues/95) + The project seems to no longer be maintained.. + --> org.jvnet.jaxb2_commons jaxb2-basics-runtime 0.11.1 - + + - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 + - com.sun.xml.bind - jaxb-impl - 2.3.1 + jakarta.activation + jakarta.activation-api + 1.2.2 + org.glassfish.jaxb jaxb-runtime - 3.0.1 + 2.3.6 runtime + org.testng testng @@ -480,8 +485,8 @@ 10.14.2.0 5.15.13 3.3.6 - 2.11.0 - 2.1.1 + 2.12.5 + 2.1.6 8.0.1 4.0.1 1.7.30