Skip to content

J
java-gitlab-api
Commit a73a494e authored by Tim Olshansky's avatar Tim Olshansky
Browse files
Options

Merge pull request #55 from babltiga/dependency-updates 

Dependency Upgrades
parents e0c4f02d a886ed0d
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 175 deletions
pom.xml
View file @ a73a494e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.gitlab</groupId> <groupId>org.gitlab</groupId>
<artifactId>java-gitlab-api</artifactId> <artifactId>java-gitlab-api</artifactId>
<version>1.1.8-SNAPSHOT</version> <version>1.1.8-SNAPSHOT</version>
<name>Gitlab Java API Wrapper</name> <name>Gitlab Java API Wrapper</name>
<description>A Java wrapper for the Gitlab Git Hosting Server API</description> <description>A Java wrapper for the Gitlab Git Hosting Server API</description>
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId> <artifactId>oss-parent</artifactId>
<version>9</version> <version>9</version>
</parent> </parent>
<developers> <developers>
<developer> <developer>
<id>timols</id> <id>timols</id>
<name>Tim Olshansky</name> <name>Tim Olshansky</name>
<email>tim.olshansky@gmail.com</email> <email>tim.olshansky@gmail.com</email>
</developer> </developer>
</developers> </developers>
<contributors> <contributors>
<contributor> <contributor>
<name>Adam Retter</name> <name>Adam Retter</name>
<email>adam.retter@googlemail.com</email> <email>adam.retter@googlemail.com</email>
<organization>Evolved Binary Ltd</organization> <organization>Evolved Binary Ltd</organization>
</contributor> </contributor>
<contributor> <contributor>
<name>Cesar Aguilar</name> <name>Cesar Aguilar</name>
<email>cesar@fuzzproductions.com</email> <email>cesar@fuzzproductions.com</email>
<organization>Fuzz Productions</organization> <organization>Fuzz Productions</organization>
</contributor> </contributor>
<contributor> <contributor>
<name>Chris Luu</name> <name>Chris Luu</name>
<email>luu@fuzzproductions.com</email> <email>luu@fuzzproductions.com</email>
<organization>Fuzz Productions</organization> <organization>Fuzz Productions</organization>
</contributor> </contributor>
</contributors> </contributors>
<licenses> <licenses>
<license> <license>
<name>The Apache Software License, Version 2.0</name> <name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<scm> <scm>
<connection>scm:git:ssh://github.com/timols/java-gitlab-api.git</connection> <connection>scm:git:ssh://github.com/timols/java-gitlab-api.git</connection>
<developerConnection>scm:git:ssh://git@github.com/timols/java-gitlab-api.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com/timols/java-gitlab-api.git</developerConnection>
<url>https://github.com/timols/java-gitlab-api</url> <url>https://github.com/timols/java-gitlab-api</url>
</scm> </scm>
<issueManagement> <issueManagement>
<system>Github</system> <system>Github</system>
<url>https://github.com/timols/java-gitlab-api/issues</url> <url>https://github.com/timols/java-gitlab-api/issues</url>
</issueManagement> </issueManagement>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core</artifactId>
<version>1.9.13</version> <version>2.5.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-databind</artifactId>
<version>1.9.13</version> <version>2.5.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.4</version> <version>2.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId> <artifactId>hamcrest-all</artifactId>
<version>1.3</version> <version>1.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.11</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version> <version>2.5.1</version>
<configuration> <configuration>
<source>1.6</source> <source>1.6</source>
<target>1.6</target> <target>1.6</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version> <version>2.17</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version> <version>2.17</version>
<executions> <executions>
<execution> <execution>
<id>default-integration-test</id> <id>default-integration-test</id>
<goals> <goals>
<goal>integration-test</goal> <goal>integration-test</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>default-verify</id> <id>default-verify</id>
<goals> <goals>
<goal>verify</goal> <goal>verify</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
<phase>verify</phase> <phase>verify</phase>
<goals> <goals>
<goal>jar-no-fork</goal> <goal>jar-no-fork</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
src/main/java/org/gitlab/api/GitlabAPI.java
View file @ a73a494e
package org.gitlab.api; package org.gitlab.api;
import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper;
import org.gitlab.api.http.GitlabHTTPRequestor;
import org.gitlab.api.http.Query;
import org.gitlab.api.models.*;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URL; import java.net.URL;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.gitlab.api.http.GitlabHTTPRequestor;
import org.gitlab.api.http.Query;
import org.gitlab.api.models.GitlabAccessLevel;
import org.gitlab.api.models.GitlabBranch;
import org.gitlab.api.models.GitlabCommit;
import org.gitlab.api.models.GitlabCommitDiff;
import org.gitlab.api.models.GitlabGroup;
import org.gitlab.api.models.GitlabGroupMember;
import org.gitlab.api.models.GitlabIssue;
import org.gitlab.api.models.GitlabMergeRequest;
import org.gitlab.api.models.GitlabMilestone;
import org.gitlab.api.models.GitlabNamespace;
import org.gitlab.api.models.GitlabNote;
import org.gitlab.api.models.GitlabProject;
import org.gitlab.api.models.GitlabProjectHook;
import org.gitlab.api.models.GitlabProjectMember;
import org.gitlab.api.models.GitlabSSHKey;
import org.gitlab.api.models.GitlabSession;
import org.gitlab.api.models.GitlabUser;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
/** /**
* Gitlab API Wrapper class * Gitlab API Wrapper class
...@@ -23,7 +39,7 @@ import java.util.List; ...@@ -23,7 +39,7 @@ import java.util.List;
*/ */
public class GitlabAPI { public class GitlabAPI {
public static final ObjectMapper MAPPER = new ObjectMapper().configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); public static final ObjectMapper MAPPER = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
private static final String API_NAMESPACE = "/api/v3"; private static final String API_NAMESPACE = "/api/v3";
private static final String PARAM_SUDO = "sudo"; private static final String PARAM_SUDO = "sudo";
......
src/main/java/org/gitlab/api/models/GitlabAbstractMember.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public abstract class GitlabAbstractMember extends GitlabUser { public abstract class GitlabAbstractMember extends GitlabUser {
......
src/main/java/org/gitlab/api/models/GitlabAccessLevel.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
public enum GitlabAccessLevel { public enum GitlabAccessLevel {
Guest(10), Guest(10),
......
src/main/java/org/gitlab/api/models/GitlabBranch.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabBranch { public class GitlabBranch {
public final static String URL = "/repository/branches/"; public final static String URL = "/repository/branches/";
......
src/main/java/org/gitlab/api/models/GitlabBranchCommit.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabBranchCommit { public class GitlabBranchCommit {
public static String URL = "/users"; public static String URL = "/users";
......
src/main/java/org/gitlab/api/models/GitlabCommit.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabCommit { public class GitlabCommit {
public final static String URL = "/commits"; public final static String URL = "/commits";
......
src/main/java/org/gitlab/api/models/GitlabCommitDiff.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabCommitDiff { public class GitlabCommitDiff {
......
src/main/java/org/gitlab/api/models/GitlabGroup.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabGroup { public class GitlabGroup {
......
src/main/java/org/gitlab/api/models/GitlabIssue.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabIssue { public class GitlabIssue {
public enum Action { public enum Action {
......
src/main/java/org/gitlab/api/models/GitlabMergeRequest.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabMergeRequest { public class GitlabMergeRequest {
public static final String URL = "/merge_requests"; public static final String URL = "/merge_requests";
......
src/main/java/org/gitlab/api/models/GitlabMilestone.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabMilestone { public class GitlabMilestone {
public static final String URL = "/milestones"; public static final String URL = "/milestones";
......
src/main/java/org/gitlab/api/models/GitlabNamespace.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabNamespace { public class GitlabNamespace {
public static final String URL = "/groups"; public static final String URL = "/groups";
......
src/main/java/org/gitlab/api/models/GitlabNote.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabNote { public class GitlabNote {
public static final String URL = "/notes"; public static final String URL = "/notes";
......
src/main/java/org/gitlab/api/models/GitlabPermission.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabPermission { public class GitlabPermission {
......
src/main/java/org/gitlab/api/models/GitlabProject.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabProject { public class GitlabProject {
public static final String URL = "/projects"; public static final String URL = "/projects";
......
src/main/java/org/gitlab/api/models/GitlabProjectAccessLevel.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabProjectAccessLevel { public class GitlabProjectAccessLevel {
......
src/main/java/org/gitlab/api/models/GitlabProjectHook.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabProjectHook { public class GitlabProjectHook {
public final static String URL = "/hooks"; public final static String URL = "/hooks";
......
src/main/java/org/gitlab/api/models/GitlabSSHKey.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabSSHKey { public class GitlabSSHKey {
public static String KEYS_URL = "/keys"; public static String KEYS_URL = "/keys";
......
src/main/java/org/gitlab/api/models/GitlabSession.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabSession extends GitlabUser { public class GitlabSession extends GitlabUser {
......
src/main/java/org/gitlab/api/models/GitlabUser.java
View file @ a73a494e
package org.gitlab.api.models; package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GitlabUser { public class GitlabUser {
public static String URL = "/users"; public static String URL = "/users";
public static String USERS_URL = "/users"; public static String USERS_URL = "/users";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment