Skip to content

Commit

Permalink
Merge pull request #113 from ebx/dev
Browse files Browse the repository at this point in the history
Release 2.0.0 version
  • Loading branch information
MarcFletcher authored Nov 24, 2020
2 parents c1f4ad1 + 7f3618d commit 966dd76
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 91 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,6 @@ sorted by creation date.
* OrganizationConnection.retrieveOrganizationBrandByParentOrganization will return
all the organization brands linked to an orginzation

## 1.0.9 (Work in progress)
## 2.0.0 (November 24, 2020)
* Updated all dependencies.
* RemovedLinkedinLogger as EventLogger had been removed from slf4j-ext.
39 changes: 16 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<groupId>com.echobox</groupId>
<artifactId>ebx-linkedin-sdk</artifactId>
<version>1.0.8</version>
<version>2.0.0</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -53,29 +53,29 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.2</version>
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
<version>3.11</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
Expand All @@ -92,7 +92,7 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-oauth2</artifactId>
<version>v1-rev145-1.25.0</version>
<version>v2-rev157-1.25.0</version>
</dependency>
<dependency>
<groupId>com.eclipsesource.minimal-json</groupId>
Expand All @@ -101,19 +101,12 @@
</dependency>
</dependencies>

<repositories>
<repository>
<id>projectlombok.org</id>
<url>http://projectlombok.org/mavenrepo</url>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.8.1</version>
<configuration>
<showDeprecation>true</showDeprecation>
</configuration>
Expand All @@ -133,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -147,7 +140,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
<executions>
<execution>
<id>validate</id>
Expand Down Expand Up @@ -190,19 +183,19 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.29</version>
<version>8.37</version>
</dependency>
<dependency>
<groupId>com.github.sevntu-checkstyle</groupId>
<artifactId>sevntu-checks</artifactId>
<version>1.28.0</version>
<version>1.38.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.6</version>
<version>3.13.0</version>
<executions>
<execution>
<id>cpd</id>
Expand Down Expand Up @@ -232,7 +225,7 @@
<plugin>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-maven-plugin</artifactId>
<version>1.18.0.0</version>
<version>1.18.16.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand Down Expand Up @@ -273,7 +266,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -286,7 +279,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import com.echobox.api.linkedin.exception.ResponseErrorJsonParsingException;
import com.echobox.api.linkedin.jsonmapper.DefaultJsonMapper;
import com.echobox.api.linkedin.jsonmapper.JsonMapper;
import com.echobox.api.linkedin.logging.LinkedInLogger;
import com.echobox.api.linkedin.util.URLUtils;
import com.echobox.api.linkedin.util.ValidationUtils;
import com.echobox.api.linkedin.version.Version;
Expand All @@ -43,6 +42,7 @@
import com.eclipsesource.json.ParseException;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.net.HttpURLConnection;
Expand All @@ -60,7 +60,7 @@
*/
public class DefaultLinkedInClient extends BaseLinkedInClient implements LinkedInClient {

private static final Logger LOGGER = LinkedInLogger.getLoggerInstance();
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultLinkedInClient.class);

/**
* HTTP parameter names.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import static java.lang.String.format;

import com.echobox.api.linkedin.logging.LinkedInLogger;
import com.echobox.api.linkedin.util.JsonUtils;
import com.echobox.api.linkedin.util.URLUtils;
import com.eclipsesource.json.Json;
Expand All @@ -46,6 +45,7 @@
import com.google.api.client.json.jackson2.JacksonFactory;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
Expand All @@ -66,7 +66,7 @@
*/
public class DefaultWebRequestor implements WebRequestor {

private static final Logger LOGGER = LinkedInLogger.getLoggerInstance();
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultWebRequestor.class);

/**
* Arbitrary unique boundary marker for multipart {@code POST}s.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import static java.util.Collections.unmodifiableSet;

import com.echobox.api.linkedin.exception.LinkedInJsonMappingException;
import com.echobox.api.linkedin.logging.LinkedInLogger;
import com.echobox.api.linkedin.types.urn.URN;
import com.echobox.api.linkedin.util.DateUtils;
import com.echobox.api.linkedin.util.ObjectUtil;
Expand All @@ -41,6 +40,7 @@
import com.eclipsesource.json.ParseException;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
Expand All @@ -63,7 +63,7 @@
*/
public class DefaultJsonMapper implements JsonMapper {

private static final Logger LOGGER = LinkedInLogger.getLoggerInstance();
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultJsonMapper.class);

/**
* We call this instance's {@link JsonMappingErrorHandler#handleMappingError(String, Class, Exception)} method on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
import static java.util.Collections.unmodifiableList;

import com.echobox.api.linkedin.exception.LinkedInJsonMappingException;
import com.echobox.api.linkedin.logging.LinkedInLogger;
import com.eclipsesource.json.Json;
import com.eclipsesource.json.JsonArray;
import com.eclipsesource.json.JsonObject;
import com.eclipsesource.json.JsonValue;
import com.eclipsesource.json.ParseException;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -40,7 +40,7 @@
*/
public class LinkedInJsonMapperV1 extends DefaultJsonMapper {

private static Logger LOGGER = LinkedInLogger.getLoggerInstance();
private static Logger LOGGER = LoggerFactory.getLogger(LinkedInJsonMapperV1.class);

/**
* Creates a JSON mapper which will throw
Expand Down
47 changes: 0 additions & 47 deletions src/main/java/com/echobox/api/linkedin/logging/LinkedInLogger.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.echobox.api.linkedin.types.v1;

import com.echobox.api.linkedin.logging.LinkedInLogger;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Company type
Expand Down Expand Up @@ -63,7 +63,7 @@ public enum CompanyType implements CodeType<String> {
*/
PARTNERSHIP("S");

private static Logger LOGGER = LinkedInLogger.getLoggerInstance();
private static Logger LOGGER = LoggerFactory.getLogger(CompanyType.class);

@Getter
private final String code;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.echobox.api.linkedin.types.v1;

import com.echobox.api.linkedin.logging.LinkedInLogger;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* EmployeeCountRange
Expand Down Expand Up @@ -67,7 +67,7 @@ public enum EmployeeCountRange implements CodeType<String> {
*/
XXXL("I", "10,000+", 10001, null);

private static Logger LOGGER = LinkedInLogger.getLoggerInstance();
private static Logger LOGGER = LoggerFactory.getLogger(EmployeeCountRange.class);

@Getter
private final String code;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

package com.echobox.api.linkedin.types.v1;

import com.echobox.api.linkedin.logging.LinkedInLogger;
import lombok.Getter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Industry code
Expand Down Expand Up @@ -621,7 +621,7 @@ public enum IndustryCode implements CodeType<Integer> {
*/
WRITING_EDITING(103, "Writing and Editing", Group.ART, Group.MED, Group.REC);

private static Logger LOGGER = LinkedInLogger.getLoggerInstance();
private static Logger LOGGER = LoggerFactory.getLogger(IndustryCode.class);

@Getter
private final Integer code;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.echobox.api.linkedin.types.v1;

import com.echobox.api.linkedin.logging.LinkedInLogger;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Status type
Expand Down Expand Up @@ -51,7 +51,7 @@ public enum StatusType implements CodeType<String> {
*/
ACQUIRED("ACQ");

private static Logger LOGGER = LinkedInLogger.getLoggerInstance();
private static Logger LOGGER = LoggerFactory.getLogger(StatusType.class);

@Getter
private final String code;
Expand Down
Loading

0 comments on commit 966dd76

Please sign in to comment.