diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml index c1da0cfa5..36241677f 100644 --- a/.github/workflows/ci-master.yml +++ b/.github/workflows/ci-master.yml @@ -17,11 +17,11 @@ jobs: with: # Disabling shallow clone is recommended for improving relevancy of reporting with SonarCloud fetch-depth: 0 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: 8 + distribution: 'temurin' + java-version: 11 - name: Build with Maven run: mvn --show-version --no-transfer-progress verify --file pom.xml -Pcoverage,cloudbees-oss-release -Dgpg.skip=true env: @@ -32,11 +32,11 @@ jobs: ZENDESK_JAVA_CLIENT_TEST_TOKEN: ${{ secrets.ZENDESK_JAVA_CLIENT_TEST_TOKEN }} ZENDESK_JAVA_CLIENT_TEST_REQUESTER_EMAIL: ${{ secrets.ZENDESK_JAVA_CLIENT_TEST_REQUESTER_EMAIL }} ZENDESK_JAVA_CLIENT_TEST_REQUESTER_NAME: ${{ secrets.ZENDESK_JAVA_CLIENT_TEST_REQUESTER_NAME }} - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: 11 + distribution: 'temurin' + java-version: 17 - name: Analyze with SonarQube run: mvn --show-version --no-transfer-progress sonar:sonar --file pom.xml -Dsonar.organization=cloudbees -Dsonar.host.url=${SONAR_URL} -Dsonar.login=${SONAR_TOKEN} env: diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index f0aabffc8..2f7c4d698 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -17,11 +17,11 @@ jobs: with: # Disabling shallow clone is recommended for improving relevancy of reporting with SonarCloud fetch-depth: 0 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: 8 + distribution: 'temurin' + java-version: 11 - name: Build with Maven run: mvn --show-version --no-transfer-progress verify --file pom.xml -Pcoverage,cloudbees-oss-release -Dgpg.skip=true env: diff --git a/README.md b/README.md index c8580a405..a6c4bd8ea 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,15 @@ Here is the status of the various API components: * [Suspended Tickets](https://developer.zendesk.com/api-reference/ticketing/tickets/suspended_tickets/) * [Triggers](https://developer.zendesk.com/api-reference/ticketing/business-rules/triggers/) ✓ +JDK Support +------ + +The current version of this project supports Java 11 and above. +It is built on Java 11 and Java 17. +The release is built using Java 11. + +Latest version supporting Java 8: 0.24.3 (https://github.com/cloudbees-oss/zendesk-java-client/releases/tag/zendesk-java-client-0.24.3). + History ------- diff --git a/pom.xml b/pom.xml index 259d69054..28af0d934 100644 --- a/pom.xml +++ b/pom.xml @@ -89,8 +89,8 @@ - 1.8 - 1.8 + 11 + 11 2.30.0 diff --git a/src/main/java/org/zendesk/client/v2/Zendesk.java b/src/main/java/org/zendesk/client/v2/Zendesk.java index 0db3683f6..219871b31 100644 --- a/src/main/java/org/zendesk/client/v2/Zendesk.java +++ b/src/main/java/org/zendesk/client/v2/Zendesk.java @@ -2401,7 +2401,9 @@ public Iterable getSearchResults(Class type return getSearchResults(type, query, Collections.emptyMap()); } - /** @deprecated Use {@link #getSearchResults(Class, String, Map)} instead. */ + /** + * @deprecated Use {@link #getSearchResults(Class, String, Map)} instead. + */ @Deprecated public Iterable getSearchResults( Class type, String query, String params) { @@ -2871,7 +2873,9 @@ public Locales listHelpCenterLocales() { return complete(submit(req("GET", cnst("/help_center/locales.json")), handle(Locales.class))); } - /** @deprecated Use {@link Zendesk#listHelpCenterLocales()} instead */ + /** + * @deprecated Use {@link Zendesk#listHelpCenterLocales()} instead + */ @Deprecated public List getHelpCenterLocales() { return listHelpCenterLocales().getLocales(); diff --git a/src/main/java/org/zendesk/client/v2/model/Condition.java b/src/main/java/org/zendesk/client/v2/model/Condition.java index 291da3c08..805e0dbbf 100644 --- a/src/main/java/org/zendesk/client/v2/model/Condition.java +++ b/src/main/java/org/zendesk/client/v2/model/Condition.java @@ -2,7 +2,9 @@ import java.io.Serializable; -/** @author Sandeep Kaul (sandeep.kaul@olacabs.com) */ +/** + * @author Sandeep Kaul (sandeep.kaul@olacabs.com) + */ public class Condition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/zendesk/client/v2/model/Conditions.java b/src/main/java/org/zendesk/client/v2/model/Conditions.java index 6b0bcb64a..83daf0473 100644 --- a/src/main/java/org/zendesk/client/v2/model/Conditions.java +++ b/src/main/java/org/zendesk/client/v2/model/Conditions.java @@ -4,7 +4,9 @@ import java.util.ArrayList; import java.util.List; -/** @author Sandeep Kaul(sandeep.kaul@olacabs.com) */ +/** + * @author Sandeep Kaul(sandeep.kaul@olacabs.com) + */ public class Conditions implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/zendesk/client/v2/model/Metric.java b/src/main/java/org/zendesk/client/v2/model/Metric.java index 90fa8141b..94310fa62 100644 --- a/src/main/java/org/zendesk/client/v2/model/Metric.java +++ b/src/main/java/org/zendesk/client/v2/model/Metric.java @@ -4,7 +4,9 @@ import java.io.Serializable; import java.util.Date; -/** @author jyrij */ +/** + * @author jyrij + */ public class Metric implements Serializable { private static final long serialVersionUID = -847290591071406141L; diff --git a/src/main/java/org/zendesk/client/v2/model/SearchResultEntity.java b/src/main/java/org/zendesk/client/v2/model/SearchResultEntity.java index b52d99ecb..7080ee353 100644 --- a/src/main/java/org/zendesk/client/v2/model/SearchResultEntity.java +++ b/src/main/java/org/zendesk/client/v2/model/SearchResultEntity.java @@ -1,4 +1,6 @@ package org.zendesk.client.v2.model; -/** @author Stephen Connolly */ +/** + * @author Stephen Connolly + */ public interface SearchResultEntity {} diff --git a/src/main/java/org/zendesk/client/v2/model/TicketImport.java b/src/main/java/org/zendesk/client/v2/model/TicketImport.java index 03f31ab9d..550ffe5a9 100644 --- a/src/main/java/org/zendesk/client/v2/model/TicketImport.java +++ b/src/main/java/org/zendesk/client/v2/model/TicketImport.java @@ -5,7 +5,9 @@ import java.util.Date; import java.util.List; -/** @author robert-fernandes */ +/** + * @author robert-fernandes + */ @JsonIgnoreProperties(value = "comment", ignoreUnknown = true) public class TicketImport extends Ticket { diff --git a/src/main/java/org/zendesk/client/v2/model/schedules/Schedule.java b/src/main/java/org/zendesk/client/v2/model/schedules/Schedule.java index d12b65383..825d5e459 100644 --- a/src/main/java/org/zendesk/client/v2/model/schedules/Schedule.java +++ b/src/main/java/org/zendesk/client/v2/model/schedules/Schedule.java @@ -29,7 +29,9 @@ public void setId(Long id) { this.id = id; } - /** @return Name of the Schedule */ + /** + * @return Name of the Schedule + */ public String getName() { return name; } @@ -38,7 +40,9 @@ public void setName(String name) { this.name = name; } - /** @return Time zone of the schedule */ + /** + * @return Time zone of the schedule + */ @JsonProperty("time_zone") public String getTimeZone() { return timeZone; @@ -48,7 +52,9 @@ public void setTimeZone(String timeZone) { this.timeZone = timeZone; } - /** @return List of intervals for the schedule */ + /** + * @return List of intervals for the schedule + */ public List getIntervals() { return intervals; } @@ -57,7 +63,9 @@ public void setIntervals(List intervals) { this.intervals = intervals; } - /** @return Time the schedule was created */ + /** + * @return Time the schedule was created + */ @JsonProperty("created_at") public Date getCreatedAt() { return createdAt; @@ -67,7 +75,9 @@ public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } - /** @return Time the schedule was last updated */ + /** + * @return Time the schedule was last updated + */ @JsonProperty("updated_at") public Date getUpdatedAt() { return updatedAt; diff --git a/src/main/java/org/zendesk/client/v2/model/targets/BasecampTarget.java b/src/main/java/org/zendesk/client/v2/model/targets/BasecampTarget.java index a653dfce9..60453c3d2 100644 --- a/src/main/java/org/zendesk/client/v2/model/targets/BasecampTarget.java +++ b/src/main/java/org/zendesk/client/v2/model/targets/BasecampTarget.java @@ -2,7 +2,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; -/** @author adavidson */ +/** + * @author adavidson + */ public class BasecampTarget extends Target { private String targetUrl; private String token; diff --git a/src/main/java/org/zendesk/client/v2/model/targets/CampfireTarget.java b/src/main/java/org/zendesk/client/v2/model/targets/CampfireTarget.java index ac78bcc7a..baa827497 100644 --- a/src/main/java/org/zendesk/client/v2/model/targets/CampfireTarget.java +++ b/src/main/java/org/zendesk/client/v2/model/targets/CampfireTarget.java @@ -2,7 +2,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; -/** @author adavidson */ +/** + * @author adavidson + */ public class CampfireTarget extends Target { private String subdomain; private boolean ssl; diff --git a/src/main/java/org/zendesk/client/v2/model/targets/EmailTarget.java b/src/main/java/org/zendesk/client/v2/model/targets/EmailTarget.java index bb9f834a6..e1d2b56b8 100644 --- a/src/main/java/org/zendesk/client/v2/model/targets/EmailTarget.java +++ b/src/main/java/org/zendesk/client/v2/model/targets/EmailTarget.java @@ -1,6 +1,8 @@ package org.zendesk.client.v2.model.targets; -/** @author adavidson */ +/** + * @author adavidson + */ public class EmailTarget extends Target { private String email; private String subject; diff --git a/src/main/java/org/zendesk/client/v2/model/targets/PivotalTarget.java b/src/main/java/org/zendesk/client/v2/model/targets/PivotalTarget.java index 85b08bc8b..1bfd646d2 100644 --- a/src/main/java/org/zendesk/client/v2/model/targets/PivotalTarget.java +++ b/src/main/java/org/zendesk/client/v2/model/targets/PivotalTarget.java @@ -2,7 +2,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; -/** @author adavidson */ +/** + * @author adavidson + */ public class PivotalTarget extends Target { private String token; private String projectId; diff --git a/src/main/java/org/zendesk/client/v2/model/targets/TwitterTarget.java b/src/main/java/org/zendesk/client/v2/model/targets/TwitterTarget.java index f8157e3db..071998599 100644 --- a/src/main/java/org/zendesk/client/v2/model/targets/TwitterTarget.java +++ b/src/main/java/org/zendesk/client/v2/model/targets/TwitterTarget.java @@ -1,6 +1,8 @@ package org.zendesk.client.v2.model.targets; -/** @author adavidson */ +/** + * @author adavidson + */ public class TwitterTarget extends Target { private String token; private String secret; diff --git a/src/main/java/org/zendesk/client/v2/model/targets/UrlTarget.java b/src/main/java/org/zendesk/client/v2/model/targets/UrlTarget.java index 2f2adc199..f1d18053d 100644 --- a/src/main/java/org/zendesk/client/v2/model/targets/UrlTarget.java +++ b/src/main/java/org/zendesk/client/v2/model/targets/UrlTarget.java @@ -2,7 +2,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; -/** @author adavidson */ +/** + * @author adavidson + */ public class UrlTarget extends Target { private String targetUrl; private String method; diff --git a/src/test/java/org/zendesk/client/v2/junit/UTCRule.java b/src/test/java/org/zendesk/client/v2/junit/UTCRule.java index 2f2fe26c9..f0ca3699d 100644 --- a/src/test/java/org/zendesk/client/v2/junit/UTCRule.java +++ b/src/test/java/org/zendesk/client/v2/junit/UTCRule.java @@ -4,7 +4,9 @@ import org.junit.rules.TestWatcher; import org.junit.runner.Description; -/** @author Johno Crawford (johno@sulake.com) */ +/** + * @author Johno Crawford (johno@sulake.com) + */ public class UTCRule extends TestWatcher { private DateTimeZone originalDefault = DateTimeZone.getDefault();