tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject [11/26] tomee git commit: Aligned MP Config version with MP aggregator version.
Date Wed, 15 Aug 2018 15:42:02 GMT
Aligned MP Config version with MP aggregator version.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4fe10483
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4fe10483
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4fe10483

Branch: refs/heads/master
Commit: 4fe10483327fa96d8869f1a0af2fb547bf44bfb8
Parents: bae6c82
Author: Roberto Cortez <radcortez@yahoo.com>
Authored: Fri Aug 10 14:31:53 2018 +0100
Committer: Roberto Cortez <radcortez@yahoo.com>
Committed: Fri Aug 10 14:31:53 2018 +0100

----------------------------------------------------------------------
 pom.xml                                                 |  5 ++---
 tck/microprofile-tck/config/pom.xml                     |  6 ++++++
 .../config/MicroProfileConfigTCKArchiveProcessor.java   | 12 ++----------
 3 files changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/4fe10483/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 891cbbc..43f9889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,9 +194,8 @@
 
     <!-- Micro Profile -->
     <microprofile.version>1.2</microprofile.version>
-    <microprofile.config.version>1.2</microprofile.config.version>
-    <!-- Geronimo Config 1.1 targets MP Config 1.2 API -->
-    <microprofile.config.impl.version>1.1</microprofile.config.impl.version>
+    <microprofile.config.version>1.1</microprofile.config.version>
+    <microprofile.config.impl.version>1.0</microprofile.config.impl.version>
     <microprofile.jwt.version>1.0</microprofile.jwt.version>
     <microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
     <microprofile.fault-tolerance.version>1.0</microprofile.fault-tolerance.version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/4fe10483/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 56c1d28..e8bdafc 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -74,6 +74,12 @@
     </dependency>
 
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
       <version>${project.version}</version>

http://git-wip-us.apache.org/repos/asf/tomee/blob/4fe10483/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 e07033b..cccd0ce 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,13 +1,11 @@
 package org.apache.openejb.tck.microprofile.config;
 
-import org.eclipse.microprofile.config.tck.converters.UpperCaseDuckConverter;
 import org.hamcrest.object.HasToString;
 import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.test.spi.TestClass;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
 
 import static org.apache.openejb.loader.JarLocation.jarLocation;
 
@@ -16,13 +14,7 @@ public class MicroProfileConfigTCKArchiveProcessor implements ApplicationArchive
     public void process(final Archive<?> archive, final TestClass testClass) {
         if (archive instanceof WebArchive) {
             final WebArchive war = WebArchive.class.cast(archive);
-
-            // 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);
-
-            war.addAsLibraries(configJar);
+            war.addAsLibrary(jarLocation(Assert.class));
             war.addAsLibrary(jarLocation(HasToString.class));
         }
     }


Mime
View raw message