From 939699e0248af3060094e2f666521b6649a9cc5b Mon Sep 17 00:00:00 2001 From: Danielen Cestari Nunes Date: Mon, 29 Jul 2024 17:08:59 -0300 Subject: [PATCH 1/3] update dependency and include pre-commit --- .pre-commit-config.yaml | 52 +++++++++++++++---- pom.xml | 42 ++++++++++----- .../mercadopago/client/MercadoPagoClient.java | 2 +- 3 files changed, 72 insertions(+), 24 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cf0127f8..e3027e4d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,13 +1,45 @@ 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 + + # Next hooks are Code Quality hooks. + # If you want them to run on each commit, uncomment them + # These are OPTIONAL. + + # - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks + # rev: v2.3.0 + # hooks: + # - id: pretty-format-golang + # args: + # - --autofix + # - repo: https://github.com/golangci/golangci-lint + # rev: v1.44.2 + # hooks: + # - id: golangci-lint + # entry: golangci-lint run + # args: + # - --max-issues-per-linter=0 + # - --max-same-issues=0 + # - --config=.code_quality/.golangci.yml + # - --new-from-rev=HEAD~1 # comment this arg if you want to run pre-commit run --all-files + + + + + + + diff --git a/pom.xml b/pom.xml index 6240dcd9..0b1afd5c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt @@ -23,10 +23,11 @@ Mercado Pago mp_sdk@mercadopago.com Mercado Pago - https://www.mercadopago.com/developers + http://www.mercadopago.com/developers + ${project.artifactId}-${project.version} src/main/java @@ -100,7 +101,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.8.0 1.8 none @@ -237,23 +238,31 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.8.0 org.apache.velocity velocity - org.apache.velocity - velocity-tools - - - org.apache.maven - maven-core + commons-collections + commons-collections + + org.apache.commons + commons-collections4 + 4.4 + + + + org.apache.commons + commons-compress + 1.26.2 + + org.apache.velocity velocity-engine-core @@ -270,6 +279,13 @@ org.apache.velocity.tools velocity-tools-generic 3.1 + + + + commons-collections + commons-collections + + @@ -279,9 +295,9 @@ - org.apache.httpcomponents - httpclient - 4.5.13 + org.apache.httpcomponents.client5 + httpclient5 + 5.3.1 diff --git a/src/main/java/com/mercadopago/client/MercadoPagoClient.java b/src/main/java/com/mercadopago/client/MercadoPagoClient.java index 855cc1e0..28071814 100644 --- 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; From 06d0f41d88e1736472ae71358c0c9d37b299c1ff Mon Sep 17 00:00:00 2001 From: Danielen Cestari Nunes Date: Mon, 29 Jul 2024 17:23:17 -0300 Subject: [PATCH 2/3] update version - bump for 2.1.27 --- README.md | 2 +- pom.xml | 2 +- src/main/java/com/mercadopago/MercadoPagoConfig.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e673518c..673bd06f 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ already. com.mercadopago sdk-java - 2.1.26 + 2.1.27 ``` diff --git a/pom.xml b/pom.xml index 0b1afd5c..3d729c28 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.mercadopago sdk-java - 2.1.26 + 2.1.27 jar Mercadopago SDK diff --git a/src/main/java/com/mercadopago/MercadoPagoConfig.java b/src/main/java/com/mercadopago/MercadoPagoConfig.java index 9470608a..2492ab77 100644 --- 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"; From 9b25026c7f967b4aa342e265306049e296752f4a Mon Sep 17 00:00:00 2001 From: Danielen Cestari Nunes Date: Wed, 31 Jul 2024 16:48:22 -0300 Subject: [PATCH 3/3] update --- .pre-commit-config.yaml | 30 +----------------------------- pom.xml | 2 +- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e3027e4d..391c5513 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,32 +14,4 @@ repos: hooks: - id: pre_commit_hook stages: [commit] - verbose: true - - # Next hooks are Code Quality hooks. - # If you want them to run on each commit, uncomment them - # These are OPTIONAL. - - # - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks - # rev: v2.3.0 - # hooks: - # - id: pretty-format-golang - # args: - # - --autofix - # - repo: https://github.com/golangci/golangci-lint - # rev: v1.44.2 - # hooks: - # - id: golangci-lint - # entry: golangci-lint run - # args: - # - --max-issues-per-linter=0 - # - --max-same-issues=0 - # - --config=.code_quality/.golangci.yml - # - --new-from-rev=HEAD~1 # comment this arg if you want to run pre-commit run --all-files - - - - - - - + verbose: true \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3d729c28..89d6efea 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ Mercado Pago mp_sdk@mercadopago.com Mercado Pago - http://www.mercadopago.com/developers + https://www.mercadopago.com/developers