Update Dependency and Include pre-commit (#293)

* update dependency and include pre-commit * update version - bump for 2.1.27
mercadopago · Aug 1, 2024 · 8f0f0e1 · 8f0f0e1
1 parent 4410bc7
commit 8f0f0e1
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 26 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,13 +1,17 @@
 repos:
-  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.2.0
+  # Websec hook is MANDATORY, DO NOT comment it.
+  - repo: https://github.com/melisource/fury_websec-git-hooks
+    rev: v1.1.0
     hooks:
-      - id: pretty-format-java
-        args: [ --autofix ]
-  - repo: https://github.com/gherynos/pre-commit-java
-    rev: v0.1.0
+      - id: pre_commit_hook
+        stages: [commit]
+      - id: post_commit_hook
+        stages: [post-commit]
+
+  # Datasec hook is MANDATORY, DO NOT comment it.
+  - repo: https://github.com/melisource/fury_datasec-git-hooks
+    rev: 1.0.3
     hooks:
-      - id: checkstyle
-        args:
-          - -c
-          - .code_quality/checkstyle_rules.xml
+      - id: pre_commit_hook
+        stages: [commit]
+        verbose: true
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ already.
 <dependency>
     <groupId>com.mercadopago</groupId>
     <artifactId>sdk-java</artifactId>
-    <version>2.1.26</version>
+    <version>2.1.27</version>
 </dependency>
   ```
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.mercadopago</groupId>
     <artifactId>sdk-java</artifactId>
-    <version>2.1.26</version>
+    <version>2.1.27</version>
     <packaging>jar</packaging>
 
     <name>Mercadopago SDK</name>
@@ -14,7 +14,7 @@
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
 
@@ -27,6 +27,7 @@
         </developer>
     </developers>
 
+
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <sourceDirectory>src/main/java</sourceDirectory>
@@ -100,7 +101,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.3</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>1.8</source>
                     <doclint>none</doclint>
@@ -237,23 +238,31 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.3</version>
+            <version>3.8.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.velocity</groupId>
                     <artifactId>velocity</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.velocity</groupId>
-                    <artifactId>velocity-tools</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.maven</groupId>
-                    <artifactId>maven-core</artifactId>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.26.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
@@ -270,6 +279,13 @@
             <groupId>org.apache.velocity.tools</groupId>
             <artifactId>velocity-tools-generic</artifactId>
             <version>3.1</version>
+            <exclusions>
+                <!-- It was moved to https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 -->
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -279,9 +295,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3.1</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/java/com/mercadopago/MercadoPagoConfig.java b/src/main/java/com/mercadopago/MercadoPagoConfig.java
@@ -15,7 +15,7 @@
 /** Mercado Pago configuration class. */
 public class MercadoPagoConfig {
 
-  public static final String CURRENT_VERSION = "2.1.26";
+  public static final String CURRENT_VERSION = "2.1.27";
 
   public static final String PRODUCT_ID = "BC32A7VTRPP001U8NHJ0";
 

diff --git a/src/main/java/com/mercadopago/client/MercadoPagoClient.java b/src/main/java/com/mercadopago/client/MercadoPagoClient.java
@@ -1,7 +1,7 @@
 package com.mercadopago.client;
 
 import static java.util.Objects.nonNull;
-import static org.apache.commons.collections.MapUtils.isNotEmpty;
+import static org.apache.commons.collections4.MapUtils.isNotEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import com.google.gson.JsonObject;