Merge pull request fujitsu#12 from tnagao7/mp-jwt-1.2

Update MP-JWT version to 1.2.2
kosakak · Oct 5, 2021 · 1cd5a96 · 1cd5a96
2 parents 540b7be + 0a2e23c
commit 1cd5a96
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/launcher-impl/microprofile/jwt-auth/pom.xml b/launcher-impl/microprofile/jwt-auth/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2019 Fujitsu Limited and/or its affiliates. All rights reserved.
+    Copyright (c) 2019-2021 Fujitsu Limited and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
-            <artifactId>smallrye-jwt-1.1</artifactId>
+            <artifactId>smallrye-jwt-jaxrs</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/...t-auth/src/main/java/com/fujitsu/launcher/microprofile/jwt/auth/cdi/JwtAuthExtension.java b/...t-auth/src/main/java/com/fujitsu/launcher/microprofile/jwt/auth/cdi/JwtAuthExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Fujitsu Limited and/or its affiliates. All rights
+ * Copyright (c) 2019-2021 Fujitsu Limited and/or its affiliates. All rights
  * reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -31,11 +31,12 @@
 
 import io.smallrye.jwt.auth.cdi.ClaimValueProducer;
 import io.smallrye.jwt.auth.cdi.CommonJwtProducer;
+import io.smallrye.jwt.auth.cdi.JWTCallerPrincipalFactoryProducer;
 import io.smallrye.jwt.auth.cdi.JsonValueProducer;
 import io.smallrye.jwt.auth.cdi.PrincipalProducer;
 import io.smallrye.jwt.auth.cdi.RawClaimTypeProducer;
 import io.smallrye.jwt.auth.jaxrs.JWTAuthenticationFilter;
-import io.smallrye.jwt.auth.mechanism.JWTHttpAuthenticationMechanism;
+import io.smallrye.jwt.auth.principal.DefaultJWTParser;
 
 public class JwtAuthExtension implements Extension {
 
@@ -55,6 +56,8 @@ public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd, BeanManager b
             bbd.addAnnotatedType(bm.createAnnotatedType(JWTAuthenticationFilter.class), JWTAuthenticationFilter.class.getName());
             bbd.addAnnotatedType(bm.createAnnotatedType(PrincipalProducer.class), PrincipalProducer.class.getName());
             bbd.addAnnotatedType(bm.createAnnotatedType(RawClaimTypeProducer.class), RawClaimTypeProducer.class.getName());
+            bbd.addAnnotatedType(bm.createAnnotatedType(DefaultJWTParser.class), DefaultJWTParser.class.getName());
+            bbd.addAnnotatedType(bm.createAnnotatedType(JWTCallerPrincipalFactoryProducer.class), JWTCallerPrincipalFactoryProducer.class.getName());
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2017-2019 Fujitsu Limited and/or its affiliates. All rights
+    Copyright (c) 2017-2021 Fujitsu Limited and/or its affiliates. All rights
     reserved.
 
     This program and the accompanying materials are made available under the
@@ -28,7 +28,7 @@
         <mp.config.version>2.0</mp.config.version>
         <mp.fault-tolerance.version>2.0.1</mp.fault-tolerance.version>
         <mp.health.version>2.0.1</mp.health.version>
-        <mp.jwt-auth.version>1.1.1</mp.jwt-auth.version>
+        <mp.jwt-auth.version>1.2.2</mp.jwt-auth.version>
         <mp.metrics.version>2.0.1</mp.metrics.version>
         <mp.openapi.version>1.1.2</mp.openapi.version>
         <mp.opentracing.version>1.3.1</mp.opentracing.version>
@@ -42,7 +42,7 @@
         <smallrye.config.version>2.4.4</smallrye.config.version>
         <smallrye.fault-tolerance.version>1.0.1</smallrye.fault-tolerance.version>
         <smallrye.health.version>2.0.0</smallrye.health.version>
-        <smallrye.jwt.version>2.0.1</smallrye.jwt.version>
+        <smallrye.jwt.version>3.3.0</smallrye.jwt.version>
         <smallrye.metrics.version>1.1.0</smallrye.metrics.version>
         <smallrye.openapi.version>1.0.2</smallrye.openapi.version>
         <smallrye.opentracing.version>1.3.2</smallrye.opentracing.version>
@@ -158,6 +158,13 @@
                 <artifactId>microprofile-jwt-auth-tck</artifactId>
                 <version>${mp.jwt-auth.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.microprofile.jwt</groupId>
+                <artifactId>microprofile-jwt-auth-tck</artifactId>
+                <classifier>tests</classifier>
+                <type>test-jar</type>
+                <version>${mp.jwt-auth.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.microprofile.metrics</groupId>
                 <artifactId>microprofile-metrics-api</artifactId>
@@ -267,7 +274,7 @@
             </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-jwt-1.1</artifactId>
+                <artifactId>smallrye-jwt-jaxrs</artifactId>
                 <version>${smallrye.jwt.version}</version>
             </dependency>
             <dependency>