OK-415 Fine-tune exclusions

Opetushallitus · Apr 29, 2024 · f9f4edc · f9f4edc
1 parent c1037cf
commit f9f4edc
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
         <scalatra.version>2.6.3</scalatra.version>
         <slick.version>3.3.0</slick.version>
         <json4s.version>3.4.2</json4s.version>
-        <netty.version>4.1.35.Final</netty.version>
+        <netty.version>4.1.94.Final</netty.version>
         <jetty.version>9.4.43.v20210629</jetty.version>
         <dokumenttipalvelu.version>6.12-SNAPSHOT</dokumenttipalvelu.version>
     </properties>
@@ -181,6 +181,21 @@
                 <artifactId>netty-resolver</artifactId>
                 <version>${netty.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-http</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-epoll</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-unix-common</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-library</artifactId>
@@ -220,7 +235,7 @@
             <dependency>
                 <groupId>org.asynchttpclient</groupId>
                 <artifactId>async-http-client</artifactId>
-                <version>2.8.1</version>
+                <version>2.12.3</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
@@ -230,8 +245,17 @@
                         <groupId>com.sun.activation</groupId>
                         <artifactId>javax.activation</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>io.netty</groupId>
+                        <artifactId>netty-transport-native-epoll</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.5.13</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -244,6 +268,18 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-unix-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -689,25 +725,16 @@
             <artifactId>dokumenttipalvelu</artifactId>
             <version>${dokumenttipalvelu.version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>*</artifactId>
+                    <artifactId>slf4j-api</artifactId>
                 </exclusion>
-
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.2</version>
+            <version>4.5.13</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>

diff --git a/src/main/scala/fi/vm/sade/hakurekisteri/integration/henkilo/oppijaNumeroRekisteri.scala b/src/main/scala/fi/vm/sade/hakurekisteri/integration/henkilo/oppijaNumeroRekisteri.scala
@@ -6,7 +6,6 @@ import fi.vm.sade.hakurekisteri.Config
 import fi.vm.sade.hakurekisteri.integration.VirkailijaRestClient
 import fi.vm.sade.hakurekisteri.integration.hakemus.HakemusHenkilotiedot
 import fi.vm.sade.hakurekisteri.integration.mocks.HenkiloMock
-import org.apache.commons.httpclient.HttpStatus
 import org.json4s.jackson.JsonMethods._
 import org.json4s.{DefaultFormats, _}
 import support.PersonAliasesProvider
@@ -104,7 +103,7 @@ class OppijaNumeroRekisteri(client: VirkailijaRestClient, val system: ActorSyste
     client
       .postObject[Map[String, Set[String]], Seq[HenkiloViite]](
         "oppijanumerorekisteri-service.duplicatesByPersonOids"
-      )(resource = queryObject, acceptedResponseCode = HttpStatus.SC_OK)
+      )(resource = queryObject, acceptedResponseCode = 200)
       .map(viitteet => {
         val oidToLinkedOids = {
           val viitteetByMasterOid =
@@ -130,7 +129,7 @@ class OppijaNumeroRekisteri(client: VirkailijaRestClient, val system: ActorSyste
   override def getByHetu(hetu: String): Future[Henkilo] = {
     logger.debug(s"Querying with hetu ${hetu.substring(0, 6)}XXXX")
     client.readObject[Henkilo]("oppijanumerorekisteri-service.henkilo.byHetu", hetu)(
-      acceptedResponseCode = HttpStatus.SC_OK
+      acceptedResponseCode = 200
     )
   }