OK-414 Update httpclient, fix conflicts

Opetushallitus · May 15, 2024 · 11c3e8a · 11c3e8a
1 parent f57c6bc
commit 11c3e8a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     </modules>
 
     <properties>
-        <apache.httpclient.version>4.5.2</apache.httpclient.version>
+        <apache.httpclient.version>4.5.13</apache.httpclient.version>
         <auditlogger.version>8.3.0-SNAPSHOT</auditlogger.version>
         <casbah_2.11.version>3.1.0</casbah_2.11.version>
         <commons-lang.version>2.6</commons-lang.version>
@@ -539,6 +539,11 @@
                 <artifactId>dokumenttipalvelu</artifactId>
                 <version>${dokumenttipalvelu.version}</version>
             </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.15</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/valinta-tulos-service/pom.xml b/valinta-tulos-service/pom.xml
@@ -493,6 +493,10 @@
                     <groupId>commons-collections</groupId>
                     <artifactId>commons-collections</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>