Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rjdavis3
rjdavis3 committed Nov 7, 2018
2 parents 2b07034 + 7bbdd87 commit 77d619e
Show file tree
Hide file tree
Showing 3 changed files with 1,249 additions and 961 deletions.
185 changes: 158 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,25 @@
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">
<modelVersion>4.0.0</modelVersion>

<groupId>com.channelape</groupId>
<artifactId>shopify-sdk</artifactId>
<version>1.0.0-SNAPSHOT</version>

<name>Shopify SDK</name>
<description>Java SDK for Shopify REST API.</description>
<version>1.0.0-SNAPSHOT</version>
<url>https://github.com/channelape/shopify-sdk</url>

<properties>
<sonar.coverage.exclusions>src/main/java/com/shopify/client/impl/**/*</sonar.coverage.exclusions>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>1.8</java.version>
<junit.version>4.12</junit.version>
<jersey.version>2.25.1</jersey.version>
</properties>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<issueManagement>
<url>https://github.com/channelape/shopify-sdk/issues</url>
<system>GitHub</system>
</issueManagement>

<developers>
<developer>
Expand Down Expand Up @@ -47,7 +51,18 @@
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>


<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>1.8</java.version>
<junit.version>4.12</junit.version>
<slf4j.version>1.7.22</slf4j.version>
<jersey.version>2.25.1</jersey.version>
<pitest.version>1.4.3</pitest.version>
<jacoco.version>0.8.2</jacoco.version>
</properties>

<dependencies>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
Expand All @@ -70,9 +85,9 @@
<version>3.4</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-aws-messaging</artifactId>
<version>1.1.3.RELEASE</version>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.9</version>
</dependency>
<dependency>
<groupId>org.jscience</groupId>
Expand All @@ -84,6 +99,11 @@
<artifactId>json</artifactId>
<version>20160810</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>com.github.rholder</groupId>
<artifactId>guava-retrying</artifactId>
Expand Down Expand Up @@ -115,35 +135,35 @@
<plugin>
<groupId>org.pitest</groupId>
<artifactId>pitest-maven</artifactId>
<version>${pitest.version}</version>
<executions>
<execution>
<phase>integration-test</phase>
<goals>
<goal>mutationCoverage</goal>
</goals>
<configuration>
<mutationThreshold>68</mutationThreshold>
<mutationThreshold>70</mutationThreshold>
<targetClasses>
<param>com.channelape.*</param>
<param>com.shopify.*</param>
</targetClasses>
<targetTests>
<param>com.channelape.*</param>
<param>com.shopify.*Test</param>
</targetTests>
<excludedClasses>
<param>com.shopify.client.impl.ShopifyClientImpl</param>
</excludedClasses>
<outputFormats>
<outputFormat>HTML</outputFormat>
<outputFormat>XML</outputFormat>
</outputFormats>
<historyInputFile>src/test/resources/pitestHistory</historyInputFile>
<historyOutputFile>src/test/resources/pitestHistory</historyOutputFile>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<includes>
<include>com/channelape/**</include>
<include>com/shopify/**</include>
</includes>
</configuration>
<version>${jacoco.version}</version>
<executions>
<execution>
<id>default-prepare-agent</id>
Expand Down Expand Up @@ -171,6 +191,117 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
3 changes: 1 addition & 2 deletions src/main/java/com/shopify/model/adapters/TagsAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import javax.xml.bind.annotation.adapters.XmlAdapter;

import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;

public class TagsAdapter extends XmlAdapter<String, Set<String>> {

Expand All @@ -26,7 +25,7 @@ public Set<String> unmarshal(final String tags) throws Exception {

@Override
public String marshal(final Set<String> tags) throws Exception {
if (CollectionUtils.isEmpty(tags)) {
if ((tags == null) || tags.isEmpty()) {
return null;
}

Expand Down
Loading

0 comments on commit 77d619e

Please sign in to comment.