Skip to content

Commit a29532f

Browse files
authored
feat: update dependencies and fix API compatibility issues (#122)
1 parent 942509d commit a29532f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+232
-71
lines changed

pom.xml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>com.squareup.okhttp3</groupId>
125125
<artifactId>okhttp</artifactId>
126-
<version>4.9.3</version>
126+
<version>4.12.0</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>org.apache.oltu.oauth2</groupId>
@@ -134,18 +134,23 @@
134134
<dependency>
135135
<groupId>com.nimbusds</groupId>
136136
<artifactId>nimbus-jose-jwt</artifactId>
137-
<version>9.10</version>
137+
<version>9.41.1</version>
138138
</dependency>
139139

140140
<dependency>
141141
<groupId>com.fasterxml.jackson.core</groupId>
142142
<artifactId>jackson-core</artifactId>
143-
<version>2.13.3</version>
143+
<version>2.18.2</version>
144144
</dependency>
145145
<dependency>
146146
<groupId>com.fasterxml.jackson.core</groupId>
147147
<artifactId>jackson-databind</artifactId>
148-
<version>2.13.3</version>
148+
<version>2.18.2</version>
149+
</dependency>
150+
<dependency>
151+
<groupId>com.google.code.findbugs</groupId>
152+
<artifactId>jsr305</artifactId>
153+
<version>3.0.2</version>
149154
</dependency>
150155
<dependency>
151156
<groupId>junit</groupId>
@@ -156,13 +161,13 @@
156161
<dependency>
157162
<groupId>org.junit.jupiter</groupId>
158163
<artifactId>junit-jupiter-api</artifactId>
159-
<version>5.8.2</version>
164+
<version>5.11.4</version>
160165
<scope>test</scope>
161166
</dependency>
162167
<dependency>
163168
<groupId>org.junit.jupiter</groupId>
164169
<artifactId>junit-jupiter-engine</artifactId>
165-
<version>5.8.2</version>
170+
<version>5.11.4</version>
166171
<scope>test</scope>
167172
</dependency>
168173
</dependencies>

src/main/java/org/casbin/casdoor/entity/AccountItem.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
package org.casbin.casdoor.entity;
1616

17+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
18+
19+
@JsonIgnoreProperties(ignoreUnknown = true)
1720
public class AccountItem {
1821
public String name;
1922
public boolean visible;

src/main/java/org/casbin/casdoor/entity/Adapter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
// limitations under the License.
1414

1515
package org.casbin.casdoor.entity;
16+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1617

18+
19+
@JsonIgnoreProperties(ignoreUnknown = true)
1720
public class Adapter {
1821
public String owner;
1922
public String name;

src/main/java/org/casbin/casdoor/entity/Application.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414

1515
package org.casbin.casdoor.entity;
1616

17+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
18+
1719
import java.io.Serializable;
1820
import java.util.List;
1921

22+
23+
@JsonIgnoreProperties(ignoreUnknown = true)
2024
public class Application implements Serializable {
2125
public String owner;
2226
public String name;

src/main/java/org/casbin/casdoor/entity/CasbinRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.casbin.casdoor.entity;
2+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
23

4+
5+
@JsonIgnoreProperties(ignoreUnknown = true)
36
public class CasbinRule {
47
public long id;
58
public String Ptype;

src/main/java/org/casbin/casdoor/entity/Cert.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414

1515
package org.casbin.casdoor.entity;
1616

17+
18+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1719
import java.io.Serializable;
1820

21+
22+
@JsonIgnoreProperties(ignoreUnknown = true)
1923
public class Cert implements Serializable {
2024
public String owner;
2125
public String name;

src/main/java/org/casbin/casdoor/entity/EmailForm.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@
1414

1515
package org.casbin.casdoor.entity;
1616

17+
18+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1719
import java.io.Serializable;
1820
import java.util.Arrays;
1921

2022

23+
24+
@JsonIgnoreProperties(ignoreUnknown = true)
2125
public class EmailForm implements Serializable {
2226
public String title;
2327
public String content;

src/main/java/org/casbin/casdoor/entity/Enforcer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
// limitations under the License.
1414

1515
package org.casbin.casdoor.entity;
16+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1617

18+
19+
@JsonIgnoreProperties(ignoreUnknown = true)
1720
public class Enforcer {
1821
public String owner;
1922
public String name;

src/main/java/org/casbin/casdoor/entity/Group.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414

1515
package org.casbin.casdoor.entity;
1616

17+
18+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1719
import java.util.List;
1820

21+
22+
@JsonIgnoreProperties(ignoreUnknown = true)
1923
public class Group {
2024
public String owner;
2125
public String name;

src/main/java/org/casbin/casdoor/entity/Invitation.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
// limitations under the License.
1414

1515
package org.casbin.casdoor.entity;
16+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1617

18+
19+
@JsonIgnoreProperties(ignoreUnknown = true)
1720
public class Invitation {
1821
public String owner;
1922
public String name;

0 commit comments

Comments
 (0)