Skip to content

Commit e527387

Browse files
jonpereiradevjonpereiradev
committed
Merge branch 'develop' into master
2 parents 729c41f + 8ea8fda commit e527387

43 files changed

Lines changed: 515 additions & 391 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/deploy-action.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Deploy
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-18.04
11+
steps:
12+
- name: Check out Git repository
13+
uses: actions/checkout@v2
14+
15+
- name: Install Java and Maven
16+
uses: actions/setup-java@v1
17+
with:
18+
java-version: 1.8
19+
20+
- name: Cache Maven packages
21+
uses: actions/cache@v2
22+
with:
23+
path: ~/.m2
24+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
25+
restore-keys: ${{ runner.os }}-m2
26+
27+
- name: Test Maven package
28+
run: mvn -B test --file pom.xml
29+
30+
- name: Build Maven package
31+
run: mvn -B package --file pom.xml -DskipTests
32+
33+
- name: Deploy Sonatype
34+
uses: samuelmeuli/action-maven-publish@v1
35+
with:
36+
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
37+
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
38+
nexus_username: ${{ secrets.OSSRH_USERNAME }}
39+
nexus_password: ${{ secrets.OSSRH_PASSWORD }}

‎pom.xml‎

Lines changed: 73 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns="http://maven.apache.org/POM/4.0.0"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
46
<modelVersion>4.0.0</modelVersion>
57
<groupId>com.github.jonpereiradev</groupId>
68
<artifactId>diff-objects</artifactId>
7-
<version>1.2.0-SNAPSHOT</version>
9+
<version>1.2.0</version>
810
<packaging>jar</packaging>
911
<name>${project.groupId}:${project.artifactId}</name>
1012
<description>Project to help build functionality that needs to show the differences between two objects</description>
@@ -34,9 +36,9 @@
3436
</properties>
3537
<dependencies>
3638
<dependency>
37-
<groupId>commons-lang</groupId>
38-
<artifactId>commons-lang</artifactId>
39-
<version>2.6</version>
39+
<groupId>org.apache.commons</groupId>
40+
<artifactId>commons-lang3</artifactId>
41+
<version>3.11</version>
4042
</dependency>
4143
<dependency>
4244
<groupId>junit</groupId>
@@ -49,39 +51,35 @@
4951
<plugins>
5052
<plugin>
5153
<groupId>org.apache.maven.plugins</groupId>
52-
<artifactId>maven-source-plugin</artifactId>
53-
<version>3.0.1</version>
54-
<executions>
55-
<execution>
56-
<id>attach-sources</id>
57-
<goals>
58-
<goal>jar-no-fork</goal>
59-
</goals>
60-
</execution>
61-
</executions>
62-
</plugin>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-javadoc-plugin</artifactId>
66-
<version>3.0.1</version>
67-
<executions>
68-
<execution>
69-
<id>attach-javadocs</id>
70-
<goals>
71-
<goal>jar</goal>
72-
</goals>
73-
</execution>
74-
</executions>
54+
<artifactId>maven-compiler-plugin</artifactId>
55+
<version>3.8.1</version>
7556
</plugin>
7657
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-compiler-plugin</artifactId>
58+
<groupId>external.atlassian.jgitflow</groupId>
59+
<artifactId>jgitflow-maven-plugin</artifactId>
60+
<version>1.0-m5.1</version>
7961
<configuration>
80-
<source>8</source>
81-
<target>8</target>
62+
<pushFeatures>true</pushFeatures>
63+
<pushReleases>true</pushReleases>
64+
<pushHotfixes>true</pushHotfixes>
65+
<allowSnapshots>true</allowSnapshots>
66+
<allowUntracked>true</allowUntracked>
67+
<flowInitContext>
68+
<masterBranchName>master</masterBranchName>
69+
<developBranchName>develop</developBranchName>
70+
<featureBranchPrefix>feature/</featureBranchPrefix>
71+
<releaseBranchPrefix>release/</releaseBranchPrefix>
72+
<hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
73+
</flowInitContext>
8274
</configuration>
8375
</plugin>
8476
</plugins>
77+
<resources>
78+
<resource>
79+
<directory>src/main/resources</directory>
80+
<filtering>true</filtering>
81+
</resource>
82+
</resources>
8583
</build>
8684
<profiles>
8785
<profile>
@@ -98,30 +96,62 @@
9896
</distributionManagement>
9997
<build>
10098
<plugins>
99+
<plugin>
100+
<groupId>org.sonatype.plugins</groupId>
101+
<artifactId>nexus-staging-maven-plugin</artifactId>
102+
<version>1.6.8</version>
103+
<extensions>true</extensions>
104+
<configuration>
105+
<serverId>ossrh</serverId>
106+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
107+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
108+
</configuration>
109+
</plugin>
101110
<plugin>
102111
<groupId>org.apache.maven.plugins</groupId>
103112
<artifactId>maven-gpg-plugin</artifactId>
104-
<version>1.5</version>
113+
<version>1.6</version>
105114
<executions>
106115
<execution>
107116
<id>sign-artifacts</id>
108117
<phase>verify</phase>
109118
<goals>
110119
<goal>sign</goal>
111120
</goals>
121+
<configuration>
122+
<gpgArguments>
123+
<arg>--pinentry-mode</arg>
124+
<arg>loopback</arg>
125+
</gpgArguments>
126+
</configuration>
112127
</execution>
113128
</executions>
114129
</plugin>
115130
<plugin>
116-
<groupId>org.sonatype.plugins</groupId>
117-
<artifactId>nexus-staging-maven-plugin</artifactId>
118-
<version>1.6.7</version>
119-
<extensions>true</extensions>
120-
<configuration>
121-
<serverId>ossrh</serverId>
122-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
123-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
124-
</configuration>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-source-plugin</artifactId>
133+
<version>3.2.1</version>
134+
<executions>
135+
<execution>
136+
<id>attach-sources</id>
137+
<goals>
138+
<goal>jar-no-fork</goal>
139+
</goals>
140+
</execution>
141+
</executions>
142+
</plugin>
143+
<plugin>
144+
<groupId>org.apache.maven.plugins</groupId>
145+
<artifactId>maven-javadoc-plugin</artifactId>
146+
<version>3.2.0</version>
147+
<executions>
148+
<execution>
149+
<id>attach-javadocs</id>
150+
<goals>
151+
<goal>jar</goal>
152+
</goals>
153+
</execution>
154+
</executions>
125155
</plugin>
126156
</plugins>
127157
</build>

‎src/main/java/com/github/jonpereiradev/diffobjects/DiffException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Exception for any generic error found in the diff execution.
66
*
77
* @author Jonathan Pereira
8-
* @since 1.0
8+
* @since 1.0.0
99
*/
1010
public class DiffException extends RuntimeException {
1111

0 commit comments

Comments
 (0)