Skip to content

Commit 9f1d888

Browse files
committed
Implemented newer version of tests, spring and jwt.
1 parent 511511d commit 9f1d888

File tree

3 files changed

+384
-329
lines changed

3 files changed

+384
-329
lines changed

pom.xml

Lines changed: 66 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.springframework.boot</groupId>
7+
<artifactId>spring-boot-starter-parent</artifactId>
8+
<version>2.3.3.RELEASE</version>
9+
<relativePath/> <!-- lookup parent from repository -->
10+
</parent>
11+
512
<groupId>io.github.majusko</groupId>
613
<artifactId>grpc-jwt-spring-boot-starter</artifactId>
714
<version>1.0.4</version>
@@ -12,7 +19,7 @@
1219
<java.version>1.8</java.version>
1320
<maven.compiler.target>1.8</maven.compiler.target>
1421
<maven.compiler.source>1.8</maven.compiler.source>
15-
<grpc.version>1.24.0</grpc.version>
22+
<grpc.version>1.31.1</grpc.version>
1623
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
1724
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
1825
</properties>
@@ -28,7 +35,7 @@
2835
<dependency>
2936
<groupId>io.jsonwebtoken</groupId>
3037
<artifactId>jjwt-api</artifactId>
31-
<version>0.11.2</version>
38+
<version>0.10.5</version>
3239
</dependency>
3340

3441
<dependency>
@@ -48,28 +55,48 @@
4855
<dependency>
4956
<groupId>io.github.lognet</groupId>
5057
<artifactId>grpc-spring-boot-starter</artifactId>
51-
<version>3.4.3</version>
58+
<version>3.5.7</version>
5259
</dependency>
5360

61+
<dependency>
62+
<groupId>org.projectlombok</groupId>
63+
<artifactId>lombok</artifactId>
64+
<version>1.18.12</version>
65+
<scope>provided</scope>
66+
</dependency>
67+
68+
69+
<!-- TESTS -->
5470
<dependency>
5571
<groupId>org.springframework.boot</groupId>
5672
<artifactId>spring-boot-starter-test</artifactId>
57-
<version>1.5.13.RELEASE</version>
5873
<scope>test</scope>
74+
<exclusions>
75+
<!-- exclude junit 4 -->
76+
<exclusion>
77+
<groupId>junit</groupId>
78+
<artifactId>junit</artifactId>
79+
</exclusion>
80+
<exclusion>
81+
<groupId>org.junit.vintage</groupId>
82+
<artifactId>junit-vintage-engine</artifactId>
83+
</exclusion>
84+
</exclusions>
5985
</dependency>
6086

87+
<!-- include junit 5 -->
6188
<dependency>
62-
<groupId>io.grpc</groupId>
63-
<artifactId>grpc-testing</artifactId>
64-
<version>${grpc.version}</version>
89+
<groupId>org.junit.jupiter</groupId>
90+
<artifactId>junit-jupiter-engine</artifactId>
91+
<version>${junit-jupiter.version}</version>
6592
<scope>test</scope>
6693
</dependency>
6794

6895
<dependency>
69-
<groupId>org.projectlombok</groupId>
70-
<artifactId>lombok</artifactId>
71-
<version>1.18.12</version>
72-
<scope>provided</scope>
96+
<groupId>io.grpc</groupId>
97+
<artifactId>grpc-testing</artifactId>
98+
<version>${grpc.version}</version>
99+
<scope>test</scope>
73100
</dependency>
74101

75102
</dependencies>
@@ -116,14 +143,29 @@
116143
<groupId>org.springframework.boot</groupId>
117144
<artifactId>spring-boot-maven-plugin</artifactId>
118145
<version>2.3.3.RELEASE</version>
146+
<executions>
147+
<!-- use original jar for install/deploy instead of executable spring boot jar -->
148+
<execution>
149+
<id>repackage</id>
150+
<goals>
151+
<goal>repackage</goal>
152+
</goals>
153+
<configuration>
154+
<attach>false</attach>
155+
</configuration>
156+
</execution>
157+
</executions>
119158
</plugin>
159+
120160
<plugin>
121161
<artifactId>maven-compiler-plugin</artifactId>
162+
<version>3.8.1</version>
122163
<configuration>
123-
<source>1.8</source>
124-
<target>1.8</target>
164+
<source>${maven.compiler.source}</source>
165+
<target>${maven.compiler.target}</target>
125166
</configuration>
126167
</plugin>
168+
127169
<plugin>
128170
<groupId>org.jacoco</groupId>
129171
<artifactId>jacoco-maven-plugin</artifactId>
@@ -155,6 +197,17 @@
155197
</plugins>
156198
</build>
157199

200+
<distributionManagement>
201+
<snapshotRepository>
202+
<id>ossrh</id>
203+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
204+
</snapshotRepository>
205+
<repository>
206+
<id>ossrh</id>
207+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
208+
</repository>
209+
</distributionManagement>
210+
158211
<licenses>
159212
<license>
160213
<name>Apache License, Version 2.0</name>

src/main/java/io/github/majusko/grpc/jwt/data/JwtContextData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.majusko.grpc.jwt.data;
22

3-
import io.jsonwebtoken.Claims;
3+
import io.jsonwebtoken.*;
44
import lombok.AllArgsConstructor;
55

66
import java.util.Set;

0 commit comments

Comments
 (0)