Skip to content

Commit

Permalink
Release 5.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Apr 5, 2023
1 parent 0b28ade commit 5683274
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 11 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path

name: Maven Package
on:
push

jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '8'

- name: install
run : mvn install -P !build-extras -DskipTests=true -Dmaven.javadoc.skip=true -B -V

- name: Build with Maven
id: build
run: mvn -B package --file pom.xml

- name: Release Maven package
uses: samuelmeuli/action-maven-publish@v1
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg_passphrase: ${{ secrets.PASSPHRASE }}
nexus_username: ${{ secrets.OSSRH_USERNAME }}
nexus_password: ${{ secrets.OSSRH_TOKEN }}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Add this dependency to your project's POM:
<dependency>
<groupId>com.wallee</groupId>
<artifactId>wallee-java-sdk</artifactId>
<version>5.1.0</version>
<version>5.1.2</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -33,7 +33,7 @@ Add this dependency to your project's POM:
Add this dependency to your project's build file:

```groovy
compile "com.wallee:wallee-java-sdk:5.1.0"
compile "com.wallee:wallee-java-sdk:5.1.2"
```

### Others
Expand All @@ -46,7 +46,7 @@ mvn clean package

Then manually install the following JARs:

* `target/wallee-java-sdk-5.1.0.jar`
* `target/wallee-java-sdk-5.1.2.jar`
* `target/lib/*.jar`

## Usage
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'idea'
apply plugin: 'eclipse'

group = 'com.wallee'
version = '5.1.0'
version = '5.1.2'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
settings(
organization := "com.wallee",
name := "wallee-java-sdk",
version := "5.1.0",
version := "5.1.2",
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature"),
javacOptions in compile ++= Seq("-Xlint:deprecation"),
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>wallee-java-sdk</artifactId>
<packaging>jar</packaging>
<name>wallee-java-sdk</name>
<version>5.1.0</version>
<version>5.1.2</version>
<url>https://www.wallee.com</url>
<description>The SDK for simplifying the integration with wallee API.</description>
<scm>
Expand Down Expand Up @@ -65,7 +65,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>(,3.6)</version>
<version>(,3.9)</version>
<message>Invalid Maven version. It should, at least, be 2.0</message>
</requireMavenVersion>
</rules>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/wallee/sdk/DefaultHeaders.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void intercept(HttpRequest request) throws IOException {

private HttpHeaders getDefaultHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.put("x-meta-sdk-version", "5.1.0");
headers.put("x-meta-sdk-version", "5.1.2");
headers.put("x-meta-sdk-language", "java");
headers.put("x-meta-sdk-provider", "wallee");
headers.put("x-meta-sdk-language-version", System.getProperty("java.version"));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/wallee/sdk/model/AddressCreate.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ public AddressCreate country(String country) {
}

/**
*
* The country is represented with a two-letter code (ISO 3166-1 alpha-2 standard) - for example, CH for Switzerland.
* @return country
**/
@ApiModelProperty(value = "")
@ApiModelProperty(value = "The country is represented with a two-letter code (ISO 3166-1 alpha-2 standard) - for example, CH for Switzerland.")
public String getCountry() {
return country;
}
Expand Down
18 changes: 17 additions & 1 deletion src/main/java/com/wallee/sdk/model/AnalyticsQueryExecution.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ public class AnalyticsQueryExecution {
protected Long account = null;


@JsonProperty("errorMessage")
protected String errorMessage = null;


@JsonProperty("externalId")
protected String externalId = null;

Expand Down Expand Up @@ -97,6 +101,16 @@ public Long getAccount() {
}


/**
* The error message if and only if the query has failed, otherwise null.
* @return errorMessage
**/
@ApiModelProperty(value = "The error message if and only if the query has failed, otherwise null.")
public String getErrorMessage() {
return errorMessage;
}


/**
* The External ID of the query if one had been specified; otherwise null.
* @return externalId
Expand Down Expand Up @@ -208,6 +222,7 @@ public boolean equals(java.lang.Object o) {
}
AnalyticsQueryExecution analyticsQueryExecution = (AnalyticsQueryExecution) o;
return Objects.equals(this.account, analyticsQueryExecution.account) &&
Objects.equals(this.errorMessage, analyticsQueryExecution.errorMessage) &&
Objects.equals(this.externalId, analyticsQueryExecution.externalId) &&
Objects.equals(this.failureReason, analyticsQueryExecution.failureReason) &&
Objects.equals(this.id, analyticsQueryExecution.id) &&
Expand All @@ -222,7 +237,7 @@ public boolean equals(java.lang.Object o) {

@Override
public int hashCode() {
return Objects.hash(account, externalId, failureReason, id, processingEndTime, processingStartTime, queryString, scannedDataInGb, scannedDataLimit, spaces, state);
return Objects.hash(account, errorMessage, externalId, failureReason, id, processingEndTime, processingStartTime, queryString, scannedDataInGb, scannedDataLimit, spaces, state);
}


Expand All @@ -232,6 +247,7 @@ public String toString() {
sb.append("class AnalyticsQueryExecution {\n");

sb.append(" account: ").append(toIndentedString(account)).append("\n");
sb.append(" errorMessage: ").append(toIndentedString(errorMessage)).append("\n");
sb.append(" externalId: ").append(toIndentedString(externalId)).append("\n");
sb.append(" failureReason: ").append(toIndentedString(failureReason)).append("\n");
sb.append(" id: ").append(toIndentedString(id)).append("\n");
Expand Down

0 comments on commit 5683274

Please sign in to comment.