Fixed MP Config.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4b2d1482 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4b2d1482 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4b2d1482 Branch: refs/heads/apache/tomee-7.1.x Commit: 4b2d14821f6ee1bdfbc12cb1a697c4d6d57fb01c Parents: 6918971 Author: Roberto Cortez <[email protected]> Authored: Tue Jul 24 21:04:23 2018 +0100 Committer: Roberto Cortez <[email protected]> Committed: Wed Jul 25 18:41:38 2018 +0100 ---------------------------------------------------------------------- .../src/main/resources/default.exclusions | 4 ++- tck/microprofile-tck/config/pom.xml | 30 ++++---------------- .../MicroProfileConfigTCKArchiveProcessor.java | 15 ++-------- tomee/tomee-microprofile-webapp/pom.xml | 2 ++ 4 files changed, 13 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4b2d1482/container/openejb-core/src/main/resources/default.exclusions ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions index f0e543b..d46396b 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -79,7 +79,9 @@ jfxrt.jar jnr- johnzon- fusemq-leveldb- -geronimo- +geronimo-connector +geronimo-javamail +geronimo-transaction google- gragent.jar groovy- http://git-wip-us.apache.org/repos/asf/tomee/blob/4b2d1482/tck/microprofile-tck/config/pom.xml ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml index b5d7e72..4d09935 100644 --- a/tck/microprofile-tck/config/pom.xml +++ b/tck/microprofile-tck/config/pom.xml @@ -33,19 +33,19 @@ <microprofile.config.version>1.2</microprofile.config.version> </properties> - <!-- TODO - see ServerClassConverter: requires a fix in geronimo-config-impl to use the Thread ClassLoader in ClassConverter. --> - <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkCount>1</forkCount> - <reuseForks>true</reuseForks> <dependenciesToScan> <dependency>org.eclipse.microprofile.config:microprofile-config-tck</dependency> </dependenciesToScan> + <!-- TODO - This requires a fix in geronimo-config-impl to use the Thread ClassLoader in ClassConverter. --> + <excludes> + <exclude>org.eclipse.microprofile.config.tck.ClassConverterTest</exclude> + </excludes> </configuration> </plugin> </plugins> @@ -59,6 +59,7 @@ <version>1.1</version> <scope>provided</scope> </dependency> + <dependency> <groupId>org.apache.tomee</groupId> <artifactId>tomee-catalina</artifactId> @@ -94,7 +95,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.9.9</version> <scope>test</scope> </dependency> @@ -109,26 +109,6 @@ <groupId>org.jboss.arquillian.testng</groupId> <artifactId>arquillian-testng-core</artifactId> <version>${version.arquillian}</version> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-api-maven</artifactId> - <version>2.2.2</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <version>2.2.2</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-spi</artifactId> - <version>2.2.2</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/tomee/blob/4b2d1482/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java ---------------------------------------------------------------------- diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java index dcee75d..e07033b 100644 --- a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java +++ b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java @@ -1,7 +1,5 @@ package org.apache.openejb.tck.microprofile.config; -import static org.apache.openejb.loader.JarLocation.jarLocation; - import org.eclipse.microprofile.config.tck.converters.UpperCaseDuckConverter; import org.hamcrest.object.HasToString; import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; @@ -11,11 +9,9 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import java.io.File; +import static org.apache.openejb.loader.JarLocation.jarLocation; public class MicroProfileConfigTCKArchiveProcessor implements ApplicationArchiveProcessor { - private File hamcrest; - @Override public void process(final Archive<?> archive, final TestClass testClass) { if (archive instanceof WebArchive) { @@ -24,15 +20,10 @@ public class MicroProfileConfigTCKArchiveProcessor implements ApplicationArchive // TODO - this could be fixed in the TCK by adding UpperCaseDuckConverter into org.eclipse.microprofile.config.tck.ConverterTest JavaArchive configJar = ShrinkWrap .create(JavaArchive.class, "config-tck-additional.jar") - .addClass(UpperCaseDuckConverter.class) - ; + .addClass(UpperCaseDuckConverter.class); war.addAsLibraries(configJar); - - if (hamcrest == null) { - hamcrest = jarLocation(HasToString.class); - } - war.addAsLibrary(hamcrest); + war.addAsLibrary(jarLocation(HasToString.class)); } } } http://git-wip-us.apache.org/repos/asf/tomee/blob/4b2d1482/tomee/tomee-microprofile-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml index 0b68fff..54b915e 100644 --- a/tomee/tomee-microprofile-webapp/pom.xml +++ b/tomee/tomee-microprofile-webapp/pom.xml @@ -76,6 +76,7 @@ <version>${microprofile.config.impl.version}</version> </dependency> + <!-- <dependency> <groupId>org.eclipse.microprofile.jwt</groupId> <artifactId>microprofile-jwt-auth-api</artifactId> @@ -87,6 +88,7 @@ <artifactId>mp-jwt</artifactId> <version>${microprofile.jwt.impl.version}</version> </dependency> + --> </dependencies>
