Merge branch 'master' into jira-link

Author: timveil

.github/workflows/ci-master.yml

@@ -18,7 +18,7 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting with SonarCloud
           fetch-depth: 0
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 8
@@ -33,7 +33,7 @@ jobs:
           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
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 11

.github/workflows/ci-pr.yml

@@ -18,7 +18,7 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting with SonarCloud
           fetch-depth: 0
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 8

.github/workflows/close-stale-items.yml

@@ -7,7 +7,7 @@ jobs:
   default:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         only-pr-labels: 'needs-fix'

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

pom.xml

@@ -99,14 +99,14 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.15.3</version>
+        <version>2.16.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
-        <version>4.1.100.Final</version>
+        <version>4.1.105.Final</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.9</version>
+      <version>2.0.11</version>
     </dependency>
     <dependency>
       <groupId>org.asynchttpclient</groupId>
@@ -152,7 +152,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.9</version>
+      <version>2.0.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -165,7 +165,7 @@
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <!-- use 2.9.0 for Java 7 projects -->
-      <version>3.24.2</version>
+      <version>3.25.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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

@@ -2361,9 +2361,7 @@ 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) {
@@ -2833,9 +2831,7 @@ 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();

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

@@ -2,9 +2,7 @@
 
 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;

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

@@ -4,9 +4,7 @@
 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;

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

@@ -4,9 +4,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-/**
- * @author jyrij
- */
+/** @author jyrij */
 public class Metric implements Serializable {
 
   private static final long serialVersionUID = -847290591071406141L;

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

@@ -1,6 +1,4 @@
 package org.zendesk.client.v2.model;
 
-/**
- * @author Stephen Connolly
- */
+/** @author Stephen Connolly */
 public interface SearchResultEntity {}