Skip to content

Commit 731dc05

Browse files
committed
Changed the release.
1 parent 69822b4 commit 731dc05

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@ language: java
22
jdk:
33
- oraclejdk8
44
dist: trusty
5-
before_deploy:
6-
- mvn help:evaluate -N -Dexpression=project.version|grep -v '\['
7-
- export project_version=$(mvn help:evaluate -N -Dexpression=project.version|grep -v '\[')
85
after_success:
96
- bash <(curl -s https://codecov.io/bash)
10-
script:
11-
- mvn package
7+
before_deploy:
8+
- "mvn -DskipTests package"
9+
- export FILE_TO_UPLOAD=$(ls target/grpc-jwt-spring-boot-starter-*.jar)
1210
deploy:
1311
provider: releases
1412
api_key:
1513
secure: Mef8otNBMl1IAdGyyp78UFJO6O++5HIWu8Q9gzd3a02HpV2Q8bEbgXSTXMB15ZyD4TMHv+B7sw+94XfJyUkqAHoyNJJcJIFL4v0L9wVdKgJm+gnOWlFR4ZFybOLqSpvpoQFj8W9Cdz2eF+P0LUyVcz0qLhYbe1m/IM+OVaaQMBBTZea7xIiHp+Qd2h5+eenqaYBnsrAMHGtv92KTswr3kw3wU2k4Dvh6Bd1GZVW75R+NTP7LMRuaEbVfgnYE07EsBqjBDoSXWQ4w+S/SPEJyDtHESBNd57RyW+zZaLDd5kWrhH+dI5My4m20znZoMIhbEiqdbQgy7EU5YFThDFgmx4qMqVEUI9cKBJAtsE4pTsOtNNjeBeQ+/AH/OQG4Nfp9yJVVgKjUnR9QORpdAFwKbbK4Xx5hVG0VVB2xDKqw5HH1MTVc9KkCtnOO5RQlJ9BCeHB9jXtvD4cdGyZAib9HbSEadpzd8MJFnpFlaErOuWvs+zOOPgr8pmNDnu/NP82V+hbgbRpBHxotgatVy+G6pEMLD4rQ8HykIHZEcYb3BcASZ4PUkig7yW+7DPzFwnmSJLlgE5H4C9mYQmy2vhyl5IXgHN4Gqnlwqt46KKuUiExI1qEjS0eUNYW7g0unhiELAvUDnwwt4d2N03d9R1eCYCWJgdUgOAIfpeRKW3GkR+4=
1614
file: target/grpc-jwt-spring-boot-starter-$project_version.jar
1715
on:
1816
repo: majusko/grpc-jwt-spring-boot-starter
17+
tags: true

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
<version>0.8.3</version>
131131
<configuration>
132132
<excludes>
133+
<exclude>**/*Application.*</exclude>
133134
<exclude>**/*Configuration.*</exclude>
134135
<exclude>**/*GrpcRole.*</exclude>
135136
<exclude>**/proto/**/*</exclude>

src/main/java/io/github/majusko/grpc/jwt/interceptor/AuthServerInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
4343
) {
4444
try {
4545
final AuthContextData contextData = parseAuthContextData(metadata);
46-
final Context context = Context.current().withValue(GrpcContext.CONTEXT_DATA_KEY, contextData);
46+
final Context context = Context.current().withValue(GrpcJwtContext.CONTEXT_DATA_KEY, contextData);
4747

4848
return buildListener(call, metadata, next, context, contextData);
4949
} catch (UnauthenticatedException e) {

src/main/java/io/github/majusko/grpc/jwt/interceptor/GrpcContext.java renamed to src/main/java/io/github/majusko/grpc/jwt/interceptor/GrpcJwtContext.java

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

33
import java.util.Optional;
44

5-
public class GrpcContext {
5+
public class GrpcJwtContext {
66

77
private static final String CONTEXT_DATA = "context_data";
88

src/test/java/io/github/majusko/grpc/jwt/GrpcJwtSpringBootStarterApplicationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.test.context.junit4.SpringRunner;
2727

2828
import java.io.IOException;
29-
import java.util.Optional;
3029

3130
@RunWith(SpringRunner.class)
3231
@SpringBootTest
@@ -237,7 +236,7 @@ class ExampleService extends ExampleServiceGrpc.ExampleServiceImplBase {
237236
@Allow(ownerField = "userId", roles = {GrpcRole.INTERNAL, ADMIN})
238237
public void getExample(Example.GetExampleRequest request, StreamObserver<Empty> response) {
239238

240-
AuthContextData authContext = GrpcContext.get().orElseThrow(RuntimeException::new);;
239+
AuthContextData authContext = GrpcJwtContext.get().orElseThrow(RuntimeException::new);
241240

242241
Assert.assertNotNull(authContext.getJwt());
243242
Assert.assertTrue(authContext.getJwtClaims().size() > 0);

0 commit comments

Comments
 (0)