Merge pull request #336 from sberyozkin/mp_parent_2.8

Bump MP parent version to 2.8

.github/workflows/build.yml

@@ -31,18 +31,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [11, 17]
     name: build with jdk ${{matrix.java}}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: checkout
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         name: set up jdk ${{matrix.java}}
         with:
+          distribution: temurin
           java-version: ${{matrix.java}}
-          distribution: 'temurin'
 
       - name: build with maven
-        run: mvn verify
+        run: |
+            mvn -q -N io.takari:maven:0.7.7:wrapper -Dmaven=3.9.0 && ./mvnw -v
+            ./mvnw -ntp formatter:validate install

api/src/main/java/org/eclipse/microprofile/jwt/ClaimLiteral.java

@@ -38,7 +38,7 @@ public ClaimLiteral() {
 
     /**
      * Construct a Claim literal from a string name of a claim
-     * 
+     *
      * @param value
      *            - the string name for claim
      */
@@ -47,7 +47,7 @@ public ClaimLiteral(String value) {
     }
     /**
      * Construct a Claim literal from a standard claim defined in {@linkplain Claims}
-     * 
+     *
      * @param standard
      *            - the claim enum value
      */

pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.eclipse.microprofile</groupId>
         <artifactId>microprofile-parent</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
     </parent>
 
     <groupId>org.eclipse.microprofile.jwt</groupId>

tck/src/main/java/org/eclipse/microprofile/jwt/tck/arquillian/BaseExtension.java

@@ -28,7 +28,7 @@
 public class BaseExtension implements LoadableExtension {
     /**
      * Called to allow for extensions of the Arquillian runtime
-     * 
+     *
      * @param extensionBuilder
      *            - extension SPI
      */
@@ -40,7 +40,7 @@ public void register(ExtensionBuilder extensionBuilder) {
 
     /**
      * Override to return your implementation of ApplicationArchiveProcessor
-     * 
+     *
      * @return vendor ApplicationArchiveProcessor implementation
      */
     protected Class<? extends ApplicationArchiveProcessor> getApplicationArchiveProcessor() {

tck/src/main/java/org/eclipse/microprofile/jwt/tck/arquillian/BaseWarArchiveProcessor.java

@@ -56,7 +56,7 @@ public void process(Archive<?> appArchive, TestClass testClass) {
 
     /**
      * Called to get names of WEB-INF resources
-     * 
+     *
      * @return names of classpath resources to add to the WEB-INF directory, empty for none
      */
     protected String[] getWebInfResources() {
@@ -66,7 +66,7 @@ protected String[] getWebInfResources() {
 
     /**
      * groupId:artifactId:version dependencies to include in WEB-INF/lib directory
-     * 
+     *
      * @return names of mvn dependencies to include, empty for none
      */
     protected String[] getWebInfLibArtifacts() {

tck/src/main/java/org/eclipse/microprofile/jwt/tck/util/TokenUtils.java

@@ -682,7 +682,7 @@ private static String readJsonContent(String jsonResName) throws IOException {
 
     /**
      * Read a classpath resource into a string and return it.
-     * 
+     *
      * @param resName
      *            - classpath resource name
      * @return the resource content as a string
@@ -705,7 +705,7 @@ public static String readResource(String resName) throws IOException {
 
     /**
      * Read a PEM encoded RSA private key from the classpath
-     * 
+     *
      * @param pemResName
      *            - key file resource name
      * @return RSAPrivateKey
@@ -721,7 +721,7 @@ public static RSAPrivateKey readPrivateKey(final String pemResName) throws Excep
 
     /**
      * Read a PEM encoded EC private key from the classpath
-     * 
+     *
      * @param pemResName
      *            - key file resource name
      * @return ECPrivateKey
@@ -737,7 +737,7 @@ public static ECPrivateKey readECPrivateKey(final String pemResName) throws Exce
 
     /**
      * Read a PEM encoded RSA public key from the classpath
-     * 
+     *
      * @param pemResName
      *            - key file resource name
      * @return RSAPublicKey
@@ -753,7 +753,7 @@ public static RSAPublicKey readPublicKey(final String pemResName) throws Excepti
 
     /**
      * Read a PEM encoded EC public key from the classpath
-     * 
+     *
      * @param pemResName
      *            - key file resource name
      * @return ECPublicKey
@@ -769,7 +769,7 @@ public static ECPublicKey readECPublicKey(final String pemResName) throws Except
 
     /**
      * Read a public key in JWK format from the classpath
-     * 
+     *
      * @param jwkResName
      *            - key file resource name
      * @return PublicKey
@@ -783,7 +783,7 @@ public static PublicKey readJwkPublicKey(final String jwkResName) throws Excepti
 
     /**
      * Read a private key in JWK format from the classpath
-     * 
+     *
      * @param jwkResName
      *            - key file resource name
      * @return PublicKey
@@ -797,7 +797,7 @@ public static PrivateKey readJwkPrivateKey(final String jwkResName) throws Excep
 
     /**
      * Generate a new RSA keypair.
-     * 
+     *
      * @param keySize
      *            - the size of the key
      * @return KeyPair
@@ -812,7 +812,7 @@ public static KeyPair generateKeyPair(final int keySize) throws NoSuchAlgorithmE
 
     /**
      * Decode a PEM encoded private key string to an RSA PrivateKey
-     * 
+     *
      * @param pemEncoded
      *            - PEM string for private key
      * @return RSAPrivateKey
@@ -829,7 +829,7 @@ public static RSAPrivateKey decodePrivateKey(final String pemEncoded) throws Exc
 
     /**
      * Decode a PEM encoded private key string to an EC PrivateKey
-     * 
+     *
      * @param pemEncoded
      *            - PEM string for private key
      * @return ECPrivateKey
@@ -846,7 +846,7 @@ public static ECPrivateKey decodeECPrivateKey(final String pemEncoded) throws Ex
 
     /**
      * Decode a PEM encoded public key string to an RSA PublicKey
-     * 
+     *
      * @param pemEncoded
      *            - PEM string for private key
      * @return RSAPublicKey
@@ -863,7 +863,7 @@ public static RSAPublicKey decodePublicKey(String pemEncoded) throws Exception {
 
     /**
      * Decode a PEM encoded public key string to an EC PublicKey
-     * 
+     *
      * @param pemEncoded
      *            - PEM string for private key
      * @return ECPublicKey

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/ECPublicKeyAsJWKLocationTest.java

@@ -69,7 +69,7 @@ public class ECPublicKeyAsJWKLocationTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is referenced via
      * the mp.jwt.verify.publickey.location as an embedded resource property. The root url is /jwks
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/ECPublicKeyAsPEMLocationTest.java

@@ -69,7 +69,7 @@ public class ECPublicKeyAsPEMLocationTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is included as the
      * mp.jwt.verify.publickey property. The root url is /
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/ECPublicKeyAsPEMTest.java

@@ -65,7 +65,7 @@ public class ECPublicKeyAsPEMTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM EC public key that is included as
      * the mp.jwt.verify.publickey property. The root url is /
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/IssValidationFailTest.java

@@ -70,7 +70,7 @@ public class IssValidationFailTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is included as the
      * mp.jwt.verify.publickey property. The root url is /
-     * 
+     *
      * @return the base base web application archive
      * @throws Exception
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/IssValidationTest.java

@@ -74,7 +74,7 @@ public class IssValidationTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is included as the
      * mp.jwt.verify.publickey property. The root url is /
-     * 
+     *
      * @return the base base web application archive
      * @throws Exception
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsBase64JWKTest.java

@@ -73,7 +73,7 @@ public class PublicKeyAsBase64JWKTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded JWKS public key that is included as the
      * mp.jwt.verify.publickey property. The root url is /jwks
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsFileLocationURLTest.java

@@ -72,7 +72,7 @@ public class PublicKeyAsFileLocationURLTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is referenced via
      * the mp.jwt.verify.publickey.location as a URL resource property. The root url is /pem
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsJWKLocationTest.java

@@ -69,7 +69,7 @@ public class PublicKeyAsJWKLocationTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is referenced via
      * the mp.jwt.verify.publickey.location as an embedded resource property. The root url is /jwks
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsJWKLocationURLTest.java

@@ -72,7 +72,7 @@ public class PublicKeyAsJWKLocationURLTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes a JWKS endpoint that is referenced via the
      * mp.jwt.verify.publickey.location as a URL resource property. The root url is /jwks
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsJWKSLocationTest.java

@@ -69,7 +69,7 @@ public class PublicKeyAsJWKSLocationTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is referenced via
      * the mp.jwt.verify.publickey.location as an embedded resource property. The root url is /jwks
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsJWKSTest.java

@@ -71,7 +71,7 @@ public class PublicKeyAsJWKSTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded JWKS public key that is included as the
      * mp.jwt.verify.publickey property. The root url is /jwks
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsJWKTest.java

@@ -72,7 +72,7 @@ public class PublicKeyAsJWKTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded JWKS public key that is included as the
      * mp.jwt.verify.publickey property. The root url is /jwks
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsPEMLocationTest.java

@@ -69,7 +69,7 @@ public class PublicKeyAsPEMLocationTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is included as the
      * mp.jwt.verify.publickey property. The root url is /
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsPEMLocationURLTest.java

@@ -71,7 +71,7 @@ public class PublicKeyAsPEMLocationURLTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded JWK public key that is referenced via
      * the mp.jwt.verify.publickey.location as a URL resource property. The root url is /pem
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure

tck/src/test/java/org/eclipse/microprofile/jwt/tck/config/PublicKeyAsPEMTest.java

@@ -66,7 +66,7 @@ public class PublicKeyAsPEMTest extends Arquillian {
     /**
      * Create a CDI aware base web application archive that includes an embedded PEM public key that is included as the
      * mp.jwt.verify.publickey property. The root url is /
-     * 
+     *
      * @return the base base web application archive
      * @throws IOException
      *             - on resource failure