Skip to content

Commit bb6218b

Browse files
authored
Merge pull request #674 from PierreBtz/pbeitz/jdk11
[chore] Drop Java 8 support
2 parents 31bae8f + d9fb0cb commit bb6218b

18 files changed

+77
-30
lines changed

.github/workflows/ci-master.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
with:
1818
# Disabling shallow clone is recommended for improving relevancy of reporting with SonarCloud
1919
fetch-depth: 0
20-
- name: Set up JDK 1.8
20+
- name: Set up JDK 11
2121
uses: actions/setup-java@v4
2222
with:
23-
distribution: 'adopt'
24-
java-version: 8
23+
distribution: 'temurin'
24+
java-version: 11
2525
- name: Build with Maven
2626
run: mvn --show-version --no-transfer-progress verify --file pom.xml -Pcoverage,cloudbees-oss-release -Dgpg.skip=true
2727
env:
@@ -32,11 +32,11 @@ jobs:
3232
ZENDESK_JAVA_CLIENT_TEST_TOKEN: ${{ secrets.ZENDESK_JAVA_CLIENT_TEST_TOKEN }}
3333
ZENDESK_JAVA_CLIENT_TEST_REQUESTER_EMAIL: ${{ secrets.ZENDESK_JAVA_CLIENT_TEST_REQUESTER_EMAIL }}
3434
ZENDESK_JAVA_CLIENT_TEST_REQUESTER_NAME: ${{ secrets.ZENDESK_JAVA_CLIENT_TEST_REQUESTER_NAME }}
35-
- name: Set up JDK 11
35+
- name: Set up JDK 17
3636
uses: actions/setup-java@v4
3737
with:
38-
distribution: 'adopt'
39-
java-version: 11
38+
distribution: 'temurin'
39+
java-version: 17
4040
- name: Analyze with SonarQube
4141
run: mvn --show-version --no-transfer-progress sonar:sonar --file pom.xml -Dsonar.organization=cloudbees -Dsonar.host.url=${SONAR_URL} -Dsonar.login=${SONAR_TOKEN}
4242
env:

.github/workflows/ci-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
with:
1818
# Disabling shallow clone is recommended for improving relevancy of reporting with SonarCloud
1919
fetch-depth: 0
20-
- name: Set up JDK 1.8
20+
- name: Set up JDK 11
2121
uses: actions/setup-java@v4
2222
with:
23-
distribution: 'adopt'
24-
java-version: 8
23+
distribution: 'temurin'
24+
java-version: 11
2525
- name: Build with Maven
2626
run: mvn --show-version --no-transfer-progress verify --file pom.xml -Pcoverage,cloudbees-oss-release -Dgpg.skip=true
2727
env:

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,15 @@ Here is the status of the various API components:
8989
* [Suspended Tickets](https://developer.zendesk.com/api-reference/ticketing/tickets/suspended_tickets/)
9090
* [Triggers](https://developer.zendesk.com/api-reference/ticketing/business-rules/triggers/)
9191

92+
JDK Support
93+
------
94+
95+
The current version of this project supports Java 11 and above.
96+
It is built on Java 11 and Java 17.
97+
The release is built using Java 11.
98+
99+
Latest version supporting Java 8: 0.24.3 (https://github.com/cloudbees-oss/zendesk-java-client/releases/tag/zendesk-java-client-0.24.3).
100+
92101
History
93102
-------
94103

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
</ciManagement>
9090

9191
<properties>
92-
<maven.compiler.source>1.8</maven.compiler.source>
93-
<maven.compiler.target>1.8</maven.compiler.target>
92+
<maven.compiler.source>11</maven.compiler.source>
93+
<maven.compiler.target>11</maven.compiler.target>
9494
<spotless.version>2.30.0</spotless.version>
9595
</properties>
9696

src/main/java/org/zendesk/client/v2/Zendesk.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2401,7 +2401,9 @@ public <T extends SearchResultEntity> Iterable<T> getSearchResults(Class<T> type
24012401
return getSearchResults(type, query, Collections.emptyMap());
24022402
}
24032403

2404-
/** @deprecated Use {@link #getSearchResults(Class, String, Map)} instead. */
2404+
/**
2405+
* @deprecated Use {@link #getSearchResults(Class, String, Map)} instead.
2406+
*/
24052407
@Deprecated
24062408
public <T extends SearchResultEntity> Iterable<T> getSearchResults(
24072409
Class<T> type, String query, String params) {
@@ -2871,7 +2873,9 @@ public Locales listHelpCenterLocales() {
28712873
return complete(submit(req("GET", cnst("/help_center/locales.json")), handle(Locales.class)));
28722874
}
28732875

2874-
/** @deprecated Use {@link Zendesk#listHelpCenterLocales()} instead */
2876+
/**
2877+
* @deprecated Use {@link Zendesk#listHelpCenterLocales()} instead
2878+
*/
28752879
@Deprecated
28762880
public List<String> getHelpCenterLocales() {
28772881
return listHelpCenterLocales().getLocales();

src/main/java/org/zendesk/client/v2/model/Condition.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import java.io.Serializable;
44

5-
/** @author Sandeep Kaul (sandeep.kaul@olacabs.com) */
5+
/**
6+
* @author Sandeep Kaul (sandeep.kaul@olacabs.com)
7+
*/
68
public class Condition implements Serializable {
79

810
private static final long serialVersionUID = 1L;

src/main/java/org/zendesk/client/v2/model/Conditions.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import java.util.ArrayList;
55
import java.util.List;
66

7-
/** @author Sandeep Kaul(sandeep.kaul@olacabs.com) */
7+
/**
8+
* @author Sandeep Kaul(sandeep.kaul@olacabs.com)
9+
*/
810
public class Conditions implements Serializable {
911

1012
private static final long serialVersionUID = 1L;

src/main/java/org/zendesk/client/v2/model/Metric.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import java.io.Serializable;
55
import java.util.Date;
66

7-
/** @author jyrij */
7+
/**
8+
* @author jyrij
9+
*/
810
public class Metric implements Serializable {
911

1012
private static final long serialVersionUID = -847290591071406141L;
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
package org.zendesk.client.v2.model;
22

3-
/** @author Stephen Connolly */
3+
/**
4+
* @author Stephen Connolly
5+
*/
46
public interface SearchResultEntity {}

src/main/java/org/zendesk/client/v2/model/TicketImport.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import java.util.Date;
66
import java.util.List;
77

8-
/** @author robert-fernandes */
8+
/**
9+
* @author robert-fernandes
10+
*/
911
@JsonIgnoreProperties(value = "comment", ignoreUnknown = true)
1012
public class TicketImport extends Ticket {
1113

src/main/java/org/zendesk/client/v2/model/schedules/Schedule.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ public void setId(Long id) {
2929
this.id = id;
3030
}
3131

32-
/** @return Name of the Schedule */
32+
/**
33+
* @return Name of the Schedule
34+
*/
3335
public String getName() {
3436
return name;
3537
}
@@ -38,7 +40,9 @@ public void setName(String name) {
3840
this.name = name;
3941
}
4042

41-
/** @return Time zone of the schedule */
43+
/**
44+
* @return Time zone of the schedule
45+
*/
4246
@JsonProperty("time_zone")
4347
public String getTimeZone() {
4448
return timeZone;
@@ -48,7 +52,9 @@ public void setTimeZone(String timeZone) {
4852
this.timeZone = timeZone;
4953
}
5054

51-
/** @return List of intervals for the schedule */
55+
/**
56+
* @return List of intervals for the schedule
57+
*/
5258
public List<Interval> getIntervals() {
5359
return intervals;
5460
}
@@ -57,7 +63,9 @@ public void setIntervals(List<Interval> intervals) {
5763
this.intervals = intervals;
5864
}
5965

60-
/** @return Time the schedule was created */
66+
/**
67+
* @return Time the schedule was created
68+
*/
6169
@JsonProperty("created_at")
6270
public Date getCreatedAt() {
6371
return createdAt;
@@ -67,7 +75,9 @@ public void setCreatedAt(Date createdAt) {
6775
this.createdAt = createdAt;
6876
}
6977

70-
/** @return Time the schedule was last updated */
78+
/**
79+
* @return Time the schedule was last updated
80+
*/
7181
@JsonProperty("updated_at")
7282
public Date getUpdatedAt() {
7383
return updatedAt;

src/main/java/org/zendesk/client/v2/model/targets/BasecampTarget.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44

5-
/** @author adavidson */
5+
/**
6+
* @author adavidson
7+
*/
68
public class BasecampTarget extends Target {
79
private String targetUrl;
810
private String token;

src/main/java/org/zendesk/client/v2/model/targets/CampfireTarget.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44

5-
/** @author adavidson */
5+
/**
6+
* @author adavidson
7+
*/
68
public class CampfireTarget extends Target {
79
private String subdomain;
810
private boolean ssl;

src/main/java/org/zendesk/client/v2/model/targets/EmailTarget.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.zendesk.client.v2.model.targets;
22

3-
/** @author adavidson */
3+
/**
4+
* @author adavidson
5+
*/
46
public class EmailTarget extends Target {
57
private String email;
68
private String subject;

src/main/java/org/zendesk/client/v2/model/targets/PivotalTarget.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44

5-
/** @author adavidson */
5+
/**
6+
* @author adavidson
7+
*/
68
public class PivotalTarget extends Target {
79
private String token;
810
private String projectId;

src/main/java/org/zendesk/client/v2/model/targets/TwitterTarget.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.zendesk.client.v2.model.targets;
22

3-
/** @author adavidson */
3+
/**
4+
* @author adavidson
5+
*/
46
public class TwitterTarget extends Target {
57
private String token;
68
private String secret;

src/main/java/org/zendesk/client/v2/model/targets/UrlTarget.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44

5-
/** @author adavidson */
5+
/**
6+
* @author adavidson
7+
*/
68
public class UrlTarget extends Target {
79
private String targetUrl;
810
private String method;

src/test/java/org/zendesk/client/v2/junit/UTCRule.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import org.junit.rules.TestWatcher;
55
import org.junit.runner.Description;
66

7-
/** @author Johno Crawford (johno@sulake.com) */
7+
/**
8+
* @author Johno Crawford (johno@sulake.com)
9+
*/
810
public class UTCRule extends TestWatcher {
911

1012
private DateTimeZone originalDefault = DateTimeZone.getDefault();

0 commit comments

Comments
 (0)