Repository: tomee Updated Branches: refs/heads/master 6c1a810e8 -> 36d78b8e9
TOMEE-2247 - Update MP JWT API to 1.1. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3b717d9f Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3b717d9f Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3b717d9f Branch: refs/heads/master Commit: 3b717d9fec01b25a8e1e197d254c46b9a7bc999a Parents: 42605b7 Author: Roberto Cortez <[email protected]> Authored: Wed Sep 12 12:29:45 2018 +0100 Committer: Roberto Cortez <[email protected]> Committed: Fri Dec 7 18:07:30 2018 +0000 ---------------------------------------------------------------------- mp-jwt/pom.xml | 6 +++ pom.xml | 3 +- .../jwt/src/test/resources/arquillian.xml | 38 +++++++------- .../jwt/src/test/resources/dev.xml | 55 +++++++++++--------- 4 files changed, 56 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/3b717d9f/mp-jwt/pom.xml ---------------------------------------------------------------------- diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml index ea65bd8..975a025 100644 --- a/mp-jwt/pom.xml +++ b/mp-jwt/pom.xml @@ -39,6 +39,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.eclipse.microprofile.config</groupId> + <artifactId>microprofile-config-api</artifactId> + <version>${microprofile.config.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.tomee</groupId> <artifactId>javaee-api</artifactId> <version>${version.javaee-api}</version> http://git-wip-us.apache.org/repos/asf/tomee/blob/3b717d9f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4c99419..a433b69 100644 --- a/pom.xml +++ b/pom.xml @@ -200,8 +200,7 @@ <microprofile.version>2.0</microprofile.version> <microprofile.config.version>1.3</microprofile.config.version> <microprofile.config.impl.version>1.2</microprofile.config.impl.version> - <!-- 1.1 Implementation ongoing in TOMEE-2247 --> - <microprofile.jwt.version>1.0</microprofile.jwt.version> + <microprofile.jwt.version>1.1</microprofile.jwt.version> <microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version> <!-- 1.1 Implementation not started yet --> <microprofile.fault-tolerance.version>1.0</microprofile.fault-tolerance.version> http://git-wip-us.apache.org/repos/asf/tomee/blob/3b717d9f/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml b/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml index 8e7a66b..e14a14b 100644 --- a/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml @@ -16,24 +16,22 @@ See the License for the specific language governing permissions and limitations under the License. --> -<arquillian - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" - http://jboss.org/schema/arquillian - http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> - - <container qualifier="tomee" default="true"> - <configuration> - <property name="catalina_opts">-Xmx512m -XX:MaxPermSize=512m</property> - <property name="httpPort">-1</property> - <property name="stopPort">-1</property> - <property name="ajpPort">-1</property> - <property name="classifier">microprofile</property> - <property name="debug">false</property> - <property name="dir">target/tomee-tck</property> - <property name="appWorkingDir">target/tck-workdir</property> - <property name="simpleLog">true</property> - <property name="properties"></property> - </configuration> - </container> +<arquillian xmlns="http://jboss.org/schema/arquillian"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://jboss.org/schema/arquillian + http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> +<container qualifier="tomee-remote" default="true"> + <configuration> + <property name="debug">false</property> + <property name="httpPort">-1</property> + <property name="ajpPort">-1</property> + <property name="stopPort">-1</property> + <property name="classifier">microprofile</property> + <property name="conf">src/test/conf</property> + <property name="dir">target/tomee</property> + <property name="appWorkingDir">target/workdir</property> + <property name="cleanOnStartUp">true</property> + </configuration> +</container> </arquillian> http://git-wip-us.apache.org/repos/asf/tomee/blob/3b717d9f/tck/microprofile-tck/jwt/src/test/resources/dev.xml ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/jwt/src/test/resources/dev.xml b/tck/microprofile-tck/jwt/src/test/resources/dev.xml index 4c9bd04..9ebcb6b 100644 --- a/tck/microprofile-tck/jwt/src/test/resources/dev.xml +++ b/tck/microprofile-tck/jwt/src/test/resources/dev.xml @@ -1,27 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at + Licensed under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > -<suite name="microprofile-jwt-auth-FullTCK" verbose="1" preserve-order="true" configfailurepolicy="continue" > + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<suite name="microprofile-jwt-auth-BaseTCK" verbose="1" preserve-order="true" configfailurepolicy="continue" > <!-- The required base JAX-RS and CDI based tests that all MP-JWT implementations must pass. --> - <test name="base-tests" verbose="10"> <groups> <define name="base-groups"> @@ -32,6 +28,7 @@ <include name="cdi" description="Base CDI injection of ClaimValues"/> <include name="cdi-json" description="CDI injection of JSON-P values"/> <include name="cdi-provider" description="CDI injection of javax.inject.Provider values"/> + <include name="config" description="Validate configuration using MP-config"/> </define> <define name="excludes"> <include name="debug" description="Internal debugging tests" /> @@ -42,20 +39,30 @@ </run> </groups> <classes> - <class name="org.eclipse.microprofile.jwt.tck.parsing.TokenValidationTest" /> <class name="org.eclipse.microprofile.jwt.tck.util.TokenUtilsTest" /> - <class name="org.eclipse.microprofile.jwt.tck.parsing.TestTokenClaimTypesTest" /> <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.UnsecuredPingTest" /> <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.RequiredClaimsTest" /> - <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.PrimitiveInjectionTest" /> <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.ClaimValueInjectionTest" /> <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.JsonValueInjectionTest" /> <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.ProviderInjectionTest" /> - <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.InvalidTokenTest" /> - <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.RolesAllowedTest" /> <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.RolesAllowedTest" /> - <!-- - --> + <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.InvalidTokenTest" /> + <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.PrimitiveInjectionTest" /> + <class name="org.eclipse.microprofile.jwt.tck.container.jaxrs.PrincipalInjectionTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsPEMTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsPEMLocationTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsPEMLocationURLTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsJWKTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsJWKLocationTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsJWKLocationURLTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsJWKSTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsJWKSLocationTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsBase64JWKTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.PublicKeyAsFileLocationURLTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.IssNoValidationNoIssTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.IssNoValidationBadIssTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.IssValidationTest" /> + <class name="org.eclipse.microprofile.jwt.tck.config.IssValidationFailTest" /> </classes> </test> </suite>
