Skip to content

Commit

Permalink
Merge pull request #674 from PierreBtz/pbeitz/jdk11
Browse files Browse the repository at this point in the history
[chore] Drop Java 8 support
  • Loading branch information
PierreBtz authored Mar 1, 2024
2 parents 31bae8f + d9fb0cb commit bb6218b
Show file tree
Hide file tree
Showing 18 changed files with 77 additions and 30 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
</ciManagement>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<spotless.version>2.30.0</spotless.version>
</properties>

Expand Down
8 changes: 6 additions & 2 deletions src/main/java/org/zendesk/client/v2/Zendesk.java
Original file line number Diff line number Diff line change
Expand Up @@ -2401,7 +2401,9 @@ public <T extends SearchResultEntity> Iterable<T> getSearchResults(Class<T> 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 <T extends SearchResultEntity> Iterable<T> getSearchResults(
Class<T> type, String query, String params) {
Expand Down Expand Up @@ -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<String> getHelpCenterLocales() {
return listHelpCenterLocales().getLocales();
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/zendesk/client/v2/model/Condition.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import java.io.Serializable;

/** @author Sandeep Kaul ([email protected]) */
/**
* @author Sandeep Kaul ([email protected])
*/
public class Condition implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/zendesk/client/v2/model/Conditions.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import java.util.ArrayList;
import java.util.List;

/** @author Sandeep Kaul([email protected]) */
/**
* @author Sandeep Kaul([email protected])
*/
public class Conditions implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/zendesk/client/v2/model/Metric.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package org.zendesk.client.v2.model;

/** @author Stephen Connolly */
/**
* @author Stephen Connolly
*/
public interface SearchResultEntity {}
4 changes: 3 additions & 1 deletion src/main/java/org/zendesk/client/v2/model/TicketImport.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
20 changes: 15 additions & 5 deletions src/main/java/org/zendesk/client/v2/model/schedules/Schedule.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand All @@ -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<Interval> getIntervals() {
return intervals;
}
Expand All @@ -57,7 +63,9 @@ public void setIntervals(List<Interval> intervals) {
this.intervals = intervals;
}

/** @return Time the schedule was created */
/**
* @return Time the schedule was created
*/
@JsonProperty("created_at")
public Date getCreatedAt() {
return createdAt;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/zendesk/client/v2/junit/UTCRule.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;

/** @author Johno Crawford ([email protected]) */
/**
* @author Johno Crawford ([email protected])
*/
public class UTCRule extends TestWatcher {

private DateTimeZone originalDefault = DateTimeZone.getDefault();
Expand Down

0 comments on commit bb6218b

Please sign in to comment.