OY-4962 Päivitetty riippuvuuksien versioita

Opetushallitus · Dec 9, 2024 · 8f810a2 · 8f810a2
1 parent 21bdeb6
commit 8f810a2
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,10 +39,8 @@
     </distributionManagement>
 
 <properties>
-    <jackson.version>2.15.2</jackson.version>
+    <jackson.version>2.18.2</jackson.version>
     <spring.security.version>6.3.5</spring.security.version>
-    <surefire.plugin.version>3.1.2</surefire.plugin.version>
-    <swagger.version>1.6.11</swagger.version>
     <valintalaskenta.version>6.0.1-SNAPSHOT</valintalaskenta.version>
     <valintaperusteet-api.version>6.2-SNAPSHOT</valintaperusteet-api.version>
     <hibernate.version>6.2.4.Final</hibernate.version>
@@ -125,6 +123,21 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>fi.vm.sade</groupId>
+        <artifactId>valinta-tulos-valintarekisteri-db</artifactId>
+        <version>8.1.0-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>fi.vm.sade.java-utils</groupId>
         <artifactId>opintopolku-cas-servlet-filter</artifactId>
@@ -135,6 +148,11 @@
         <artifactId>java-cas</artifactId>
         <version>1.2.1-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>fi.vm.sade.java-utils</groupId>
+        <artifactId>java-properties</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>fi.vm.sade</groupId>
         <artifactId>auditlogger</artifactId>
@@ -199,7 +217,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-validation</artifactId>
-        <version>3.1.0</version>
+        <version>3.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
@@ -238,6 +256,16 @@
         <artifactId>commons-lang3</artifactId>
         <version>3.12.0</version>
       </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>4.4</version>
+      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
@@ -263,11 +291,6 @@
         <artifactId>jackson-dataformat-yaml</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.zaxxer</groupId>
-        <artifactId>HikariCP</artifactId>
-        <version>5.0.1</version>
-      </dependency>
       <dependency>
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
@@ -293,6 +316,11 @@
         <artifactId>tomcat</artifactId>
         <version>2.0.3</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>tomcat-servlet-api</artifactId>
+        <version>10.1.33</version>
+      </dependency>
 
       <!-- Tämä tarvitaan kunnes valintalaskenta-tulos-service.jar:sta tulee uusi versio jossa tämä on päivitetty -->
       <dependency>
@@ -311,7 +339,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.13.0</version>
+        <version>2.18.0</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
@@ -368,6 +396,11 @@
         <artifactId>woodstox-core</artifactId>
         <version>6.5.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>stax2-api</artifactId>
+        <version>4.2.2</version>
+      </dependency>
       <dependency>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-jaxrs</artifactId>
@@ -376,7 +409,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.9</version>
+        <version>1.17.1</version>
       </dependency>
       <dependency>
         <groupId>org.checkerframework</groupId>

diff --git a/sijoittelu-service/pom.xml b/sijoittelu-service/pom.xml
@@ -181,26 +181,13 @@
 		<dependency>
 			<groupId>fi.vm.sade</groupId>
 			<artifactId>valinta-tulos-valintarekisteri-db</artifactId>
-			<version>8.1.0-SNAPSHOT</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-reload4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.flywaydb</groupId>
-					<artifactId>flyway-core</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>fi.vm.sade.tarjonta</groupId>
 			<artifactId>tarjonta-api</artifactId>
 			<scope>compile</scope>
 		</dependency>
 
-
-
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
@@ -260,11 +247,6 @@
 			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.1</version>
-		</dependency>
 
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -275,7 +257,6 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
-			<version>4.1</version>
 		</dependency>
 
 		<dependency>