Skip to content

Commit

Permalink
Use Jakarta 10 for imports instead of old javax
Browse files Browse the repository at this point in the history
  • Loading branch information
Yrlish committed Jul 16, 2023
1 parent 924a61c commit a8eb107
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 21 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>twitter-api-java-sdk</artifactId>
<packaging>jar</packaging>
<name>twitter-api-java-sdk</name>
<version>2.0.3</version>
<version>2.0.3-jakarta10</version>
<url>https://github.com/twitterdev/twitter-api-java-sdk</url>
<description>Twitter API v2 available endpoints</description>
<scm>
Expand Down Expand Up @@ -330,9 +330,9 @@
<version>${jsr311-api-version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${javax.ws.rs-api-version}</version>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.rs-api-version}</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
Expand Down Expand Up @@ -371,7 +371,7 @@
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<junit-version>5.8.2</junit-version>
<mockito-core-version>3.12.4</mockito-core-version>
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
<jakarta.ws.rs-api-version>3.1.0</jakarta.ws.rs-api-version>
<jsr311-api-version>1.1.1</jsr311-api-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scribejava-apis-version>8.3.1</scribejava-apis-version>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/twitter/clientlib/ApiException.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.Map;
import java.util.List;

import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

/**
* <p>ApiException class.</p>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/twitter/clientlib/api/BookmarksApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
import java.util.Map;
import java.util.Arrays;
import java.io.InputStream;
import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/twitter/clientlib/api/ComplianceApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
import java.util.Map;
import java.util.Arrays;
import java.io.InputStream;
import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/twitter/clientlib/api/GeneralApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import java.util.Map;
import java.util.Arrays;
import java.io.InputStream;
import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/twitter/clientlib/api/ListsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
import java.util.Map;
import java.util.Arrays;
import java.io.InputStream;
import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/twitter/clientlib/api/SpacesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
import java.util.Map;
import java.util.Arrays;
import java.io.InputStream;
import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/twitter/clientlib/api/TweetsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
import java.util.Map;
import java.util.Arrays;
import java.io.InputStream;
import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/twitter/clientlib/api/UsersApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
import java.util.Map;
import java.util.Arrays;
import java.io.InputStream;
import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import org.apache.commons.lang3.StringUtils;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.util.Objects;
import java.lang.reflect.Type;
import java.util.Map;
import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

//import com.fasterxml.jackson.annotation.JsonValue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import java.util.ArrayList;
import java.util.List;

import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import java.io.IOException;
import java.lang.reflect.Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;

import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import java.io.IOException;
import java.lang.reflect.Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;

import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import java.io.IOException;
import java.lang.reflect.Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;

import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import java.io.IOException;
import java.lang.reflect.Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import java.util.ArrayList;
import java.util.List;

import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import java.io.IOException;
import java.lang.reflect.Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;

import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import java.io.IOException;
import java.lang.reflect.Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import java.util.ArrayList;
import java.util.List;

import javax.ws.rs.core.GenericType;
import jakarta.ws.rs.core.GenericType;

import java.io.IOException;
import java.lang.reflect.Type;
Expand Down

0 comments on commit a8eb107

Please sign in to comment.