Merge branch 'develop' into stable

Conflicts:
	pom.xml
This commit is contained in:
Brian Long 2021-01-07 11:45:04 -05:00
commit 2a0d9fbbef
7 changed files with 25 additions and 40 deletions

28
pom.xml
View File

@ -2,10 +2,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.brianlong</groupId>
<groupId>com.inteligr8</groupId>
<artifactId>github-api</artifactId>
<packaging>jar</packaging>
<version>1.0.0</version>
<version>1.1.0</version>
<name>GitHub API &amp; Utilities</name>
@ -16,16 +16,6 @@
</properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>5.9.0.202009080501-r</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
<version>5.9.0.202009080501-r</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@ -41,6 +31,11 @@
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -86,4 +81,13 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>inteligr8-releases</id>
<name>Inteligr8 Releases</name>
<url>http://repos.yateslong.us/nexus/repository/inteligr8-public</url>
<layout>default</layout>
</repository>
</distributionManagement>
</project>

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN">
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
<PatternLayout pattern="[%t] %-5level %logger{36} - %msg%n"/>
</Console>
</Appenders>
<Loggers>
<Logger name="me.brianlong" level="trace" additivity="false">
<AppenderRef ref="STDOUT" />
</Logger>
<Root level="trace">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
</Configuration>

View File

@ -1,4 +1,4 @@
package me.brianlong.github;
package com.inteligr8.github;
import java.io.IOException;
import java.io.InputStream;
@ -19,9 +19,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
import me.brianlong.http.BaseResponse;
import me.brianlong.http.PreemptiveAuthInterceptor;
import com.inteligr8.http.BaseResponse;
import com.inteligr8.http.PreemptiveAuthInterceptor;
public class ApiGateway {

View File

@ -1,9 +1,8 @@
package me.brianlong.github.model;
package com.inteligr8.github.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import me.brianlong.http.BaseResponse;
import com.inteligr8.http.BaseResponse;
public class CreatePullRequest {

View File

@ -1,9 +1,8 @@
package me.brianlong.github.model;
package com.inteligr8.github.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import me.brianlong.http.BaseResponse;
import com.inteligr8.http.BaseResponse;
public class CreateReference {

View File

@ -1,4 +1,4 @@
package me.brianlong.http;
package com.inteligr8.http;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

View File

@ -1,4 +1,4 @@
package me.brianlong.http;
package com.inteligr8.http;
import java.io.IOException;