Skip to content

Commit

Permalink
update dependency and include pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
danielen-meli committed Jul 29, 2024
1 parent 4410bc7 commit 939699e
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 24 deletions.
52 changes: 42 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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







42 changes: 29 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -23,10 +23,11 @@
<name>Mercado Pago</name>
<email>[email protected]</email>
<organization>Mercado Pago</organization>
<organizationUrl>https://www.mercadopago.com/developers</organizationUrl>
<organizationUrl>http://www.mercadopago.com/developers</organizationUrl>
</developer>
</developers>


<build>
<finalName>${project.artifactId}-${project.version}</finalName>
<sourceDirectory>src/main/java</sourceDirectory>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 939699e

Please sign in to comment.