You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/08/15 16:25:34 UTC
[01/11] tomee git commit: Removed unnecessary system.out.
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x cc178ecfb -> 43597ce2b
Removed unnecessary system.out.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6bf4ed20
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6bf4ed20
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6bf4ed20
Branch: refs/heads/tomee-7.1.x
Commit: 6bf4ed2012b29b09af8e5daf0e78bce40252982d
Parents: 5630bbc
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Jul 27 17:02:05 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:14:15 2018 +0100
----------------------------------------------------------------------
.../main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6bf4ed20/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
----------------------------------------------------------------------
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
index ad4c6a0..d35fb93 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
@@ -56,7 +56,6 @@ public class MPJWTFilter implements Filter {
@Override
public void init(final FilterConfig filterConfig) throws ServletException {
// nothing so far
- System.out.println("MPJWTFilter.init");
}
@Override
[10/11] tomee git commit: Removed MP Metrics for TomEE 7. It seems
that it requires CDI 2.0.
Posted by jg...@apache.org.
Removed MP Metrics for TomEE 7. It seems that it requires CDI 2.0.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9ac2c150
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9ac2c150
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9ac2c150
Branch: refs/heads/tomee-7.1.x
Commit: 9ac2c150190a1a8a02ec519f053fe0e17cda4899
Parents: a67401e
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Mon Aug 13 12:58:17 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Mon Aug 13 12:58:17 2018 +0100
----------------------------------------------------------------------
tck/microprofile-tck/pom.xml | 2 +-
tomee/tomee-microprofile-webapp/pom.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9ac2c150/tck/microprofile-tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 3e2fa93..53923c1 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -35,7 +35,7 @@
<module>jwt</module>
<module>fault-tolerance</module>
<module>health</module>
- <module>metrics</module>
+ <!--<module>metrics</module>-->
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9ac2c150/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index 84c4093..1caa773 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -90,6 +90,7 @@
<version>${microprofile.health.impl.version}</version>
</dependency>
+ <!-- Metrics is not working with OWB 1.x. Apparently it requires OWB 2.x
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
@@ -101,6 +102,7 @@
<artifactId>geronimo-metrics</artifactId>
<version>${microprofile.metrics.impl.version}</version>
</dependency>
+ -->
</dependencies>
<build>
[05/11] tomee git commit: Fixed MP JWT.
Posted by jg...@apache.org.
Fixed MP JWT.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ddc9e783
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ddc9e783
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ddc9e783
Branch: refs/heads/tomee-7.1.x
Commit: ddc9e78392badb2fe62eb63e6e0d998774cf10c0
Parents: 31ee943
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Jul 24 21:04:23 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:24:00 2018 +0100
----------------------------------------------------------------------
tck/microprofile-tck/jwt/pom.xml | 60 +++++--------------
.../jwt/JWTAuthContextInfoProvider.java | 63 --------------------
.../tomee/microprofile/jwt/TCKTokenParser.java | 40 -------------
.../jwt/JWTAuthContextInfoProvider.java | 63 ++++++++++++++++++++
.../tomee/microprofile/jwt/TCKTokenParser.java | 40 +++++++++++++
5 files changed, 119 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ddc9e783/tck/microprofile-tck/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 7bf88aa..008fa67 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -27,24 +27,31 @@
<name>OpenEJB :: TCK :: MicroProfile JWT TCK</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>javaee-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.tomee</groupId>
<artifactId>mp-jwt</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-catalina</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>${johnzon.version}</version>
+ <scope>test</scope>
</dependency>
<!-- distro -->
@@ -62,6 +69,7 @@
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-tck</artifactId>
<version>${microprofile.jwt.version}</version>
+ <scope>test</scope>
</dependency>
<!-- This is the actual MP-JWT TCK test classes -->
@@ -76,7 +84,6 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.9.9</version>
<scope>test</scope>
</dependency>
@@ -93,35 +100,6 @@
<version>${version.arquillian}</version>
<scope>test</scope>
</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>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
@@ -159,12 +137,6 @@
<!-- TCK does not deliver the xml file for the moment -->
<suiteXmlFile>${project.build.directory}/test-classes/dev.xml</suiteXmlFile>
</suiteXmlFiles>
- <systemProperties>
- <!--<property>-->
- <!--<name>validation.provider</name>-->
- <!--<value>${validation.provider}</value>-->
- <!--</property>-->
- </systemProperties>
<parallel>methods</parallel>
<threadCount>4</threadCount>
</configuration>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ddc9e783/tck/microprofile-tck/jwt/src/main/java/org/apache/tomee/microprofile/jwt/JWTAuthContextInfoProvider.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/src/main/java/org/apache/tomee/microprofile/jwt/JWTAuthContextInfoProvider.java b/tck/microprofile-tck/jwt/src/main/java/org/apache/tomee/microprofile/jwt/JWTAuthContextInfoProvider.java
deleted file mode 100644
index bf0a07f..0000000
--- a/tck/microprofile-tck/jwt/src/main/java/org/apache/tomee/microprofile/jwt/JWTAuthContextInfoProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.tomee.microprofile.jwt;
-
-import org.apache.tomee.microprofile.jwt.config.JWTAuthContextInfo;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Base64;
-import java.util.Optional;
-
-@Dependent
-public class JWTAuthContextInfoProvider {
-
- @Produces
- Optional<JWTAuthContextInfo> getOptionalContextInfo() throws NoSuchAlgorithmException, InvalidKeySpecException {
- JWTAuthContextInfo contextInfo = new JWTAuthContextInfo();
-
- // todo use MP Config to load the configuration
- contextInfo.setIssuedBy("https://server.example.com");
-
- final String pemEncoded = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlivFI8qB4D0y2jy0CfEq" +
- "Fyy46R0o7S8TKpsx5xbHKoU1VWg6QkQm+ntyIv1p4kE1sPEQO73+HY8+Bzs75XwR" +
- "TYL1BmR1w8J5hmjVWjc6R2BTBGAYRPFRhor3kpM6ni2SPmNNhurEAHw7TaqszP5e" +
- "UF/F9+KEBWkwVta+PZ37bwqSE4sCb1soZFrVz/UT/LF4tYpuVYt3YbqToZ3pZOZ9" +
- "AX2o1GCG3xwOjkc4x0W7ezbQZdC9iftPxVHR8irOijJRRjcPDtA6vPKpzLl6CyYn" +
- "sIYPd99ltwxTHjr3npfv/3Lw50bAkbT4HeLFxTx4flEoZLKO/g0bAoV2uqBhkA9x" +
- "nQIDAQAB";
- byte[] encodedBytes = Base64.getDecoder().decode(pemEncoded);
-
- final X509EncodedKeySpec spec = new X509EncodedKeySpec(encodedBytes);
- final KeyFactory kf = KeyFactory.getInstance("RSA");
- final RSAPublicKey pk = (RSAPublicKey) kf.generatePublic(spec);
-
- contextInfo.setSignerKey(pk);
-
- return Optional.of(contextInfo);
- }
-
- @Produces
- JWTAuthContextInfo getContextInfo() throws InvalidKeySpecException, NoSuchAlgorithmException {
- return getOptionalContextInfo().get();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/ddc9e783/tck/microprofile-tck/jwt/src/main/java/org/apache/tomee/microprofile/jwt/TCKTokenParser.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/src/main/java/org/apache/tomee/microprofile/jwt/TCKTokenParser.java b/tck/microprofile-tck/jwt/src/main/java/org/apache/tomee/microprofile/jwt/TCKTokenParser.java
deleted file mode 100644
index ae563ec..0000000
--- a/tck/microprofile-tck/jwt/src/main/java/org/apache/tomee/microprofile/jwt/TCKTokenParser.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.tomee.microprofile.jwt;
-
-import org.apache.tomee.microprofile.jwt.config.JWTAuthContextInfo;
-import org.apache.tomee.microprofile.jwt.principal.DefaultJWTCallerPrincipalFactory;
-import org.apache.tomee.microprofile.jwt.principal.JWTCallerPrincipalFactory;
-import org.eclipse.microprofile.jwt.JsonWebToken;
-import org.eclipse.microprofile.jwt.tck.util.ITokenParser;
-
-import java.security.PublicKey;
-import java.security.interfaces.RSAPublicKey;
-
-/**
- * MP-JWT TCK harness class to parse a token string
- */
-public class TCKTokenParser implements ITokenParser {
-
- @Override
- public JsonWebToken parse(final String bearerToken, final String issuer, final PublicKey publicKey) throws Exception {
- final JWTAuthContextInfo authContextInfo = new JWTAuthContextInfo((RSAPublicKey) publicKey, issuer);
- final JWTCallerPrincipalFactory factory = DefaultJWTCallerPrincipalFactory.instance();
- return factory.parse(bearerToken, authContextInfo);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/ddc9e783/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/jwt/JWTAuthContextInfoProvider.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/jwt/JWTAuthContextInfoProvider.java b/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/jwt/JWTAuthContextInfoProvider.java
new file mode 100644
index 0000000..bf0a07f
--- /dev/null
+++ b/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/jwt/JWTAuthContextInfoProvider.java
@@ -0,0 +1,63 @@
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.tomee.microprofile.jwt;
+
+import org.apache.tomee.microprofile.jwt.config.JWTAuthContextInfo;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Produces;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+import java.util.Optional;
+
+@Dependent
+public class JWTAuthContextInfoProvider {
+
+ @Produces
+ Optional<JWTAuthContextInfo> getOptionalContextInfo() throws NoSuchAlgorithmException, InvalidKeySpecException {
+ JWTAuthContextInfo contextInfo = new JWTAuthContextInfo();
+
+ // todo use MP Config to load the configuration
+ contextInfo.setIssuedBy("https://server.example.com");
+
+ final String pemEncoded = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlivFI8qB4D0y2jy0CfEq" +
+ "Fyy46R0o7S8TKpsx5xbHKoU1VWg6QkQm+ntyIv1p4kE1sPEQO73+HY8+Bzs75XwR" +
+ "TYL1BmR1w8J5hmjVWjc6R2BTBGAYRPFRhor3kpM6ni2SPmNNhurEAHw7TaqszP5e" +
+ "UF/F9+KEBWkwVta+PZ37bwqSE4sCb1soZFrVz/UT/LF4tYpuVYt3YbqToZ3pZOZ9" +
+ "AX2o1GCG3xwOjkc4x0W7ezbQZdC9iftPxVHR8irOijJRRjcPDtA6vPKpzLl6CyYn" +
+ "sIYPd99ltwxTHjr3npfv/3Lw50bAkbT4HeLFxTx4flEoZLKO/g0bAoV2uqBhkA9x" +
+ "nQIDAQAB";
+ byte[] encodedBytes = Base64.getDecoder().decode(pemEncoded);
+
+ final X509EncodedKeySpec spec = new X509EncodedKeySpec(encodedBytes);
+ final KeyFactory kf = KeyFactory.getInstance("RSA");
+ final RSAPublicKey pk = (RSAPublicKey) kf.generatePublic(spec);
+
+ contextInfo.setSignerKey(pk);
+
+ return Optional.of(contextInfo);
+ }
+
+ @Produces
+ JWTAuthContextInfo getContextInfo() throws InvalidKeySpecException, NoSuchAlgorithmException {
+ return getOptionalContextInfo().get();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/ddc9e783/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/jwt/TCKTokenParser.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/jwt/TCKTokenParser.java b/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/jwt/TCKTokenParser.java
new file mode 100644
index 0000000..ae563ec
--- /dev/null
+++ b/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/jwt/TCKTokenParser.java
@@ -0,0 +1,40 @@
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.tomee.microprofile.jwt;
+
+import org.apache.tomee.microprofile.jwt.config.JWTAuthContextInfo;
+import org.apache.tomee.microprofile.jwt.principal.DefaultJWTCallerPrincipalFactory;
+import org.apache.tomee.microprofile.jwt.principal.JWTCallerPrincipalFactory;
+import org.eclipse.microprofile.jwt.JsonWebToken;
+import org.eclipse.microprofile.jwt.tck.util.ITokenParser;
+
+import java.security.PublicKey;
+import java.security.interfaces.RSAPublicKey;
+
+/**
+ * MP-JWT TCK harness class to parse a token string
+ */
+public class TCKTokenParser implements ITokenParser {
+
+ @Override
+ public JsonWebToken parse(final String bearerToken, final String issuer, final PublicKey publicKey) throws Exception {
+ final JWTAuthContextInfo authContextInfo = new JWTAuthContextInfo((RSAPublicKey) publicKey, issuer);
+ final JWTCallerPrincipalFactory factory = DefaultJWTCallerPrincipalFactory.instance();
+ return factory.parse(bearerToken, authContextInfo);
+ }
+
+}
[02/11] tomee git commit: Cleanup MP poms configuration.
Posted by jg...@apache.org.
Cleanup MP poms configuration.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/31ee9435
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/31ee9435
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/31ee9435
Branch: refs/heads/tomee-7.1.x
Commit: 31ee9435c66635fa2026e2689b04004ea93b0b7d
Parents: 6bf4ed2
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Jul 27 17:11:01 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:23:59 2018 +0100
----------------------------------------------------------------------
mp-jwt/pom.xml | 22 ++++++++++------------
pom.xml | 11 +++++++++--
tck/microprofile-tck/config/pom.xml | 25 -------------------------
tck/microprofile-tck/jwt/pom.xml | 4 ++--
tomee/tomee-microprofile-webapp/pom.xml | 20 ++------------------
5 files changed, 23 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/mp-jwt/pom.xml
----------------------------------------------------------------------
diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml
index 5bd0303..75624cc 100644
--- a/mp-jwt/pom.xml
+++ b/mp-jwt/pom.xml
@@ -29,6 +29,12 @@
<dependencies>
<dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>${microprofile.jwt.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
<version>${version.javaee-api}</version>
@@ -47,15 +53,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.bitbucket.b_c</groupId>
- <artifactId>jose4j</artifactId>
- <version>0.6.0</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
<version>${johnzon.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -69,12 +70,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.microprofile.jwt</groupId>
- <artifactId>microprofile-jwt-auth-api</artifactId>
- <version>${mp-jwt.version}</version>
- <scope>provided</scope>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.6.0</version>
</dependency>
</dependencies>
-
-
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88395c3..84e638c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,8 +194,15 @@
<version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
<version.shrinkwrap.resolver.bom>2.1.0</version.shrinkwrap.resolver.bom>
- <mp-jwt.version>1.0</mp-jwt.version>
- <mp-jwt-tck.version>${mp-jwt.version}</mp-jwt-tck.version>
+ <!-- Micro Profile -->
+ <microprofile.version>1.2</microprofile.version>
+ <!-- Micro Profile Config -->
+ <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>
+ <!-- Micro Profile JWT -->
+ <microprofile.jwt.version>1.0</microprofile.jwt.version>
+ <microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index 4d09935..a496ea9 100644
--- a/tck/microprofile-tck/config/pom.xml
+++ b/tck/microprofile-tck/config/pom.xml
@@ -29,10 +29,6 @@
<artifactId>microprofile-config-tck</artifactId>
<name>OpenEJB :: TCK :: MicroProfile Config TCK</name>
- <properties>
- <microprofile.config.version>1.2</microprofile.config.version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -42,32 +38,12 @@
<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>
</build>
<dependencies>
- <!-- debug libs -->
- <dependency>
- <groupId>org.apache.geronimo.config</groupId>
- <artifactId>geronimo-config-impl</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-catalina</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- distro -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-tomee</artifactId>
@@ -77,7 +53,6 @@
<scope>test</scope>
</dependency>
- <!-- tck stack -->
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/tck/microprofile-tck/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index b0fc04e..7bf88aa 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -61,14 +61,14 @@
<dependency>
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-tck</artifactId>
- <version>${mp-jwt-tck.version}</version>
+ <version>${microprofile.jwt.version}</version>
</dependency>
<!-- This is the actual MP-JWT TCK test classes -->
<dependency>
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-tck</artifactId>
- <version>${mp-jwt-tck.version}</version>
+ <version>${microprofile.jwt.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/31ee9435/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index c9c2f0c..aca8dc7 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -35,14 +35,6 @@
<packaging>war</packaging>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <microprofile.version>1.3</microprofile.version>
-
- <!-- Geronimo Config 1.1 targets MP Config 1.2 API -->
- <microprofile.config.api.version>1.2</microprofile.config.api.version>
- <microprofile.config.impl.version>1.1</microprofile.config.impl.version>
-
<microprofile.jwt.api.version>1.0</microprofile.jwt.api.version>
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
</properties>
@@ -55,19 +47,10 @@
<type>war</type>
</dependency>
- <!-- When we have everything
- <dependency>
- <groupId>org.eclipse.microprofile</groupId>
- <artifactId>microprofile</artifactId>
- <version>${microprofile.version}</version>
- <type>pom</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
- <version>${microprofile.config.api.version}</version>
+ <version>${microprofile.config.version}</version>
</dependency>
<dependency>
@@ -87,6 +70,7 @@
<artifactId>mp-jwt</artifactId>
<version>${microprofile.jwt.impl.version}</version>
</dependency>
+
</dependencies>
<build>
[11/11] tomee git commit: Merge branch 'tomee-7.1.x-mp-1.2' of
github.com:radcortez/tomee into tomee-7.1.x
Posted by jg...@apache.org.
Merge branch 'tomee-7.1.x-mp-1.2' of github.com:radcortez/tomee into tomee-7.1.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/43597ce2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/43597ce2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/43597ce2
Branch: refs/heads/tomee-7.1.x
Commit: 43597ce2bda2c30229ba88d142a724d9b0c8c5a1
Parents: cc178ec 9ac2c15
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Aug 15 16:45:57 2018 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Aug 15 16:45:57 2018 +0100
----------------------------------------------------------------------
mp-jwt/pom.xml | 22 ++--
.../tomee/microprofile/jwt/MPJWTFilter.java | 1 -
pom.xml | 15 ++-
tck/microprofile-tck/config/pom.xml | 31 +----
.../MicroProfileConfigTCKArchiveProcessor.java | 12 +-
tck/microprofile-tck/fault-tolerance/pom.xml | 85 +++++++++++++
.../src/test/resources/arquillian.xml | 37 ++++++
tck/microprofile-tck/health/pom.xml | 84 +++++++++++++
.../health/src/test/resources/arquillian.xml | 37 ++++++
tck/microprofile-tck/jwt/pom.xml | 64 +++-------
.../jwt/JWTAuthContextInfoProvider.java | 63 ----------
.../tomee/microprofile/jwt/TCKTokenParser.java | 40 -------
.../jwt/JWTAuthContextInfoProvider.java | 63 ++++++++++
.../tomee/microprofile/jwt/TCKTokenParser.java | 40 +++++++
tck/microprofile-tck/metrics/pom.xml | 120 +++++++++++++++++++
...icroProfileMetricsTCKDeploymentPackager.java | 89 ++++++++++++++
.../MicroProfileMetricsTCKExtension.java | 31 +++++
.../metrics/MicroProfileMetricsTCKObserver.java | 32 +++++
.../metrics/MicroProfileMetricsTCKProtocol.java | 27 +++++
....jboss.arquillian.core.spi.LoadableExtension | 1 +
.../metrics/src/test/resources/arquillian.xml | 40 +++++++
tck/microprofile-tck/pom.xml | 3 +
tomee/tomee-microprofile-webapp/pom.xml | 64 ++++++----
23 files changed, 778 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
[04/11] tomee git commit: Fixed Fault Tolerance TCK.
Posted by jg...@apache.org.
Fixed Fault Tolerance TCK.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/238079bb
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/238079bb
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/238079bb
Branch: refs/heads/tomee-7.1.x
Commit: 238079bb79c956b7c63018e7f5ebc25b0af16a48
Parents: e72421c
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Mon Jul 30 10:46:43 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:24:00 2018 +0100
----------------------------------------------------------------------
tck/microprofile-tck/fault-tolerance/pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/238079bb/tck/microprofile-tck/fault-tolerance/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index 59917db..eaa237a 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -39,9 +39,6 @@
<dependenciesToScan>
<dependency>org.eclipse.microprofile.fault-tolerance:microprofile-fault-tolerance-tck</dependency>
</dependenciesToScan>
- <excludes>
- <exclude>org.eclipse.microprofile.fault.tolerance.tck.ConfigTest</exclude>
- </excludes>
</configuration>
</plugin>
</plugins>
[07/11] tomee git commit: Added MP Metrics.
Posted by jg...@apache.org.
Added MP Metrics.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/62cde702
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/62cde702
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/62cde702
Branch: refs/heads/tomee-7.1.x
Commit: 62cde702f6eb1c6230e95c3ef6d1e019e937ac57
Parents: eb503d0
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Jul 31 10:45:43 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:24:00 2018 +0100
----------------------------------------------------------------------
pom.xml | 3 +
tck/microprofile-tck/metrics/pom.xml | 120 +++++++++++++++++++
...icroProfileMetricsTCKDeploymentPackager.java | 89 ++++++++++++++
.../MicroProfileMetricsTCKExtension.java | 31 +++++
.../metrics/MicroProfileMetricsTCKObserver.java | 32 +++++
.../metrics/MicroProfileMetricsTCKProtocol.java | 27 +++++
....jboss.arquillian.core.spi.LoadableExtension | 1 +
.../metrics/src/test/resources/arquillian.xml | 40 +++++++
tck/microprofile-tck/pom.xml | 1 +
tomee/tomee-microprofile-webapp/pom.xml | 12 ++
10 files changed, 356 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 890364c..6329e70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,6 +205,9 @@
<microprofile.fault-tolerance.impl.version>1.0</microprofile.fault-tolerance.impl.version>
<microprofile.health.version>1.0</microprofile.health.version>
<microprofile.health.impl.version>1.0.0</microprofile.health.impl.version>
+ <!-- MP 1.2 requires Metrics 1.0, but Geronimo implementation started right from 1.1 Metrics API -->
+ <microprofile.metrics.version>1.1</microprofile.metrics.version>
+ <microprofile.metrics.impl.version>1.0.0</microprofile.metrics.impl.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tck/microprofile-tck/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
new file mode 100644
index 0000000..0a7a1a7
--- /dev/null
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>microprofile-tck</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>microprofile-metrics-tck</artifactId>
+ <name>OpenEJB :: TCK :: MicroProfile Metrics TCK</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.0</version>
+ <configuration>
+ <reuseForks>false</reuseForks>
+ <dependenciesToScan>
+ <dependency>org.eclipse.microprofile.metrics:microprofile-metrics-api-tck</dependency>
+ <dependency>org.eclipse.microprofile.metrics:microprofile-metrics-rest-tck</dependency>
+ </dependenciesToScan>
+ <environmentVariables>
+ <MP_METRICS_TAGS>tier=integration</MP_METRICS_TAGS>
+ </environmentVariables>
+ <systemPropertyVariables>
+ <test.url>http://localhost:50290</test.url>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>${microprofile.metrics.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api-tck</artifactId>
+ <version>${microprofile.metrics.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-wlp-managed-8.5</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-rest-tck</artifactId>
+ <version>${microprofile.metrics.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>microprofile</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKDeploymentPackager.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKDeploymentPackager.java b/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKDeploymentPackager.java
new file mode 100644
index 0000000..ece8314
--- /dev/null
+++ b/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKDeploymentPackager.java
@@ -0,0 +1,89 @@
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.openejb.tck.microprofile.metrics;
+
+import org.jboss.arquillian.container.spi.client.deployment.TargetDescription;
+import org.jboss.arquillian.container.spi.client.protocol.ProtocolDescription;
+import org.jboss.arquillian.container.test.spi.TestDeployment;
+import org.jboss.arquillian.container.test.spi.client.deployment.ProtocolArchiveProcessor;
+import org.jboss.arquillian.protocol.servlet.v_2_5.ServletProtocolDeploymentPackager;
+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 java.util.Collection;
+
+/**
+ * Metrics TCK provides Archives in JAR format. Arquillian transforms them in EAR. To simplify, override the behavior
+ * and wrap them into a WAR.
+ */
+public class MicroProfileMetricsTCKDeploymentPackager extends ServletProtocolDeploymentPackager {
+ @Override
+ public Archive<?> generateDeployment(final TestDeployment testDeployment,
+ final Collection<ProtocolArchiveProcessor> processors) {
+ final Archive<?> applicationArchive = testDeployment.getApplicationArchive();
+ if (applicationArchive instanceof JavaArchive) {
+ final WebArchive wrapperWar =
+ ShrinkWrap.create(WebArchive.class, "microprofile-metrics.war").addAsLibrary(applicationArchive);
+ return super.generateDeployment(new TestDeploymentDelegate(testDeployment, wrapperWar), processors);
+ }
+
+ return super.generateDeployment(testDeployment, processors);
+ }
+
+ private static class TestDeploymentDelegate extends TestDeployment {
+ private TestDeployment testDeployment;
+ private Archive<?> archive;
+
+ public TestDeploymentDelegate(final TestDeployment testDeployment, final Archive<?> archive) {
+ super(null, archive, testDeployment.getAuxiliaryArchives());
+ this.testDeployment = testDeployment;
+ this.archive = archive;
+ }
+
+ @Override
+ public TargetDescription getTargetDescription() {
+ return testDeployment.getTargetDescription();
+ }
+
+ @Override
+ public ProtocolDescription getProtocolDescription() {
+ return testDeployment.getProtocolDescription();
+ }
+
+ @Override
+ public String getDeploymentName() {
+ return testDeployment.getDeploymentName();
+ }
+
+ @Override
+ public Archive<?> getArchiveForEnrichment() {
+ return testDeployment.getArchiveForEnrichment();
+ }
+
+ @Override
+ public Archive<?> getApplicationArchive() {
+ return archive;
+ }
+
+ @Override
+ public Collection<Archive<?>> getAuxiliaryArchives() {
+ return testDeployment.getAuxiliaryArchives();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKExtension.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKExtension.java b/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKExtension.java
new file mode 100644
index 0000000..8d4a085
--- /dev/null
+++ b/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKExtension.java
@@ -0,0 +1,31 @@
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.openejb.tck.microprofile.metrics;
+
+import org.jboss.arquillian.container.test.spi.client.protocol.Protocol;
+import org.jboss.arquillian.core.spi.LoadableExtension;
+import org.jboss.arquillian.protocol.servlet.v_2_5.ServletProtocol;
+
+public class MicroProfileMetricsTCKExtension implements LoadableExtension {
+ @Override
+ public void register(final ExtensionBuilder extensionBuilder) {
+ extensionBuilder
+ .override(Protocol.class, ServletProtocol.class, MicroProfileMetricsTCKProtocol.class)
+ .observer(MicroProfileMetricsTCKObserver.class)
+ ;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKObserver.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKObserver.java b/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKObserver.java
new file mode 100644
index 0000000..4589234
--- /dev/null
+++ b/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKObserver.java
@@ -0,0 +1,32 @@
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.openejb.tck.microprofile.metrics;
+
+import com.jayway.restassured.RestAssured;
+import org.apache.openejb.arquillian.common.TomEEContainer;
+import org.jboss.arquillian.container.spi.event.container.AfterDeploy;
+import org.jboss.arquillian.core.api.annotation.Observes;
+
+/**
+ * Metrics TCK expect the deployed test archives to be in the root context. In here, we just set the RestAssured path
+ * so the test archives are not required to be deployed in the / context root.
+ */
+public class MicroProfileMetricsTCKObserver {
+ public void AfterDeploy(@Observes final AfterDeploy afterDeploy) {
+ RestAssured.basePath = "microprofile-metrics";
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKProtocol.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKProtocol.java b/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKProtocol.java
new file mode 100644
index 0000000..4defccf
--- /dev/null
+++ b/tck/microprofile-tck/metrics/src/test/java/org/apache/openejb/tck/microprofile/metrics/MicroProfileMetricsTCKProtocol.java
@@ -0,0 +1,27 @@
+/*
+ * 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
+ *
+ * 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.
+ */
+package org.apache.openejb.tck.microprofile.metrics;
+
+import org.jboss.arquillian.container.test.spi.client.deployment.DeploymentPackager;
+import org.jboss.arquillian.protocol.servlet.v_2_5.ServletProtocol;
+
+public class MicroProfileMetricsTCKProtocol extends ServletProtocol {
+ @Override
+ public DeploymentPackager getPackager() {
+ return new MicroProfileMetricsTCKDeploymentPackager();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tck/microprofile-tck/metrics/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/tck/microprofile-tck/metrics/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
new file mode 100644
index 0000000..5c60218
--- /dev/null
+++ b/tck/microprofile-tck/metrics/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+org.apache.openejb.tck.microprofile.metrics.MicroProfileMetricsTCKExtension
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
new file mode 100644
index 0000000..7804dcd
--- /dev/null
+++ b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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
+
+ 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.
+-->
+<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">50290</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>
+ <property name="properties">
+ MP_METRICS_TAGS = tier=integration
+ </property>
+ </configuration>
+ </container>
+</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tck/microprofile-tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 8b8da66..3e2fa93 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -35,6 +35,7 @@
<module>jwt</module>
<module>fault-tolerance</module>
<module>health</module>
+ <module>metrics</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/62cde702/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index 543889d..ed460ca 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -94,6 +94,18 @@
<artifactId>geronimo-health</artifactId>
<version>${microprofile.health.impl.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>${microprofile.metrics.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-metrics</artifactId>
+ <version>${microprofile.metrics.impl.version}</version>
+ </dependency>
</dependencies>
<build>
[03/11] tomee git commit: Added MP Health Check.
Posted by jg...@apache.org.
Added MP Health Check.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb503d06
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb503d06
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb503d06
Branch: refs/heads/tomee-7.1.x
Commit: eb503d06ba9ec21ed381c56d0d93d62f2edafb90
Parents: 238079b
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Mon Jul 30 11:04:59 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:24:00 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +
tck/microprofile-tck/health/pom.xml | 84 ++++++++++++++++++++
.../health/src/test/resources/arquillian.xml | 37 +++++++++
tck/microprofile-tck/pom.xml | 1 +
tomee/tomee-microprofile-webapp/pom.xml | 12 +++
5 files changed, 136 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/eb503d06/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 17df91f..890364c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,6 +203,8 @@
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
<microprofile.fault-tolerance.version>1.0</microprofile.fault-tolerance.version>
<microprofile.fault-tolerance.impl.version>1.0</microprofile.fault-tolerance.impl.version>
+ <microprofile.health.version>1.0</microprofile.health.version>
+ <microprofile.health.impl.version>1.0.0</microprofile.health.impl.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/eb503d06/tck/microprofile-tck/health/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
new file mode 100644
index 0000000..793fa07
--- /dev/null
+++ b/tck/microprofile-tck/health/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>microprofile-tck</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>microprofile-health-tck</artifactId>
+ <name>OpenEJB :: TCK :: MicroProfile Health TCK</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Updated version to fix hanging text -->
+ <version>2.22.0</version>
+ <configuration>
+ <dependenciesToScan>
+ <dependency>org.eclipse.microprofile.health:microprofile-health-tck</dependency>
+ </dependenciesToScan>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>${microprofile.health.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-tck</artifactId>
+ <version>${microprofile.health.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>microprofile</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/eb503d06/tck/microprofile-tck/health/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/health/src/test/resources/arquillian.xml b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
new file mode 100644
index 0000000..414f1d5
--- /dev/null
+++ b/tck/microprofile-tck/health/src/test/resources/arquillian.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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
+
+ 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.
+-->
+<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/eb503d06/tck/microprofile-tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 11fac18..8b8da66 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -34,6 +34,7 @@
<module>config</module>
<module>jwt</module>
<module>fault-tolerance</module>
+ <module>health</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/eb503d06/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index afed5f8..543889d 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -82,6 +82,18 @@
<artifactId>safeguard-impl</artifactId>
<version>${microprofile.fault-tolerance.impl.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>${microprofile.health.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-health</artifactId>
+ <version>${microprofile.health.impl.version}</version>
+ </dependency>
</dependencies>
<build>
[06/11] tomee git commit: Aligned MP Config version with MP
aggregator version.
Posted by jg...@apache.org.
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/1175b817
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1175b817
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1175b817
Branch: refs/heads/tomee-7.1.x
Commit: 1175b817f63dbbb8f543fc99e824848d31d20917
Parents: 62cde70
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Aug 10 14:31:53 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:24:00 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/1175b817/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6329e70..a400aae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,9 +196,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/1175b817/tck/microprofile-tck/config/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml
index a496ea9..8db0f9e 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/1175b817/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));
}
}
[08/11] tomee git commit: Added MP Fault Tolerance.
Posted by jg...@apache.org.
Added MP Fault Tolerance.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e72421c0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e72421c0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e72421c0
Branch: refs/heads/tomee-7.1.x
Commit: e72421c0df0e0dc36a7361501d3b86f211ca51b3
Parents: ddc9e78
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Jul 27 20:22:58 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:24:00 2018 +0100
----------------------------------------------------------------------
pom.xml | 4 +-
tck/microprofile-tck/fault-tolerance/pom.xml | 88 ++++++++++++++++++++
.../src/test/resources/arquillian.xml | 37 ++++++++
tck/microprofile-tck/pom.xml | 1 +
tomee/tomee-microprofile-webapp/pom.xml | 11 +++
5 files changed, 139 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e72421c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84e638c..17df91f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,13 +196,13 @@
<!-- Micro Profile -->
<microprofile.version>1.2</microprofile.version>
- <!-- Micro Profile Config -->
<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>
- <!-- Micro Profile JWT -->
<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>
+ <microprofile.fault-tolerance.impl.version>1.0</microprofile.fault-tolerance.impl.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/e72421c0/tck/microprofile-tck/fault-tolerance/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
new file mode 100644
index 0000000..59917db
--- /dev/null
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>microprofile-tck</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>microprofile-fault-tolerance-tck</artifactId>
+ <name>OpenEJB :: TCK :: MicroProfile Fault Tolerance TCK</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Updated version to fix hanging text -->
+ <version>2.22.0</version>
+ <configuration>
+ <dependenciesToScan>
+ <dependency>org.eclipse.microprofile.fault-tolerance:microprofile-fault-tolerance-tck</dependency>
+ </dependenciesToScan>
+ <excludes>
+ <exclude>org.eclipse.microprofile.fault.tolerance.tck.ConfigTest</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-tck</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>microprofile</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/e72421c0/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
new file mode 100644
index 0000000..414f1d5
--- /dev/null
+++ b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ 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
+
+ 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.
+-->
+<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/e72421c0/tck/microprofile-tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 2885415..11fac18 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -33,6 +33,7 @@
<modules>
<module>config</module>
<module>jwt</module>
+ <module>fault-tolerance</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/e72421c0/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index aca8dc7..afed5f8 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -71,6 +71,17 @@
<version>${microprofile.jwt.impl.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.safeguard</groupId>
+ <artifactId>safeguard-impl</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ </dependency>
</dependencies>
<build>
[09/11] tomee git commit: Removed unneeded properties.
Posted by jg...@apache.org.
Removed unneeded properties.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a67401ef
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a67401ef
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a67401ef
Branch: refs/heads/tomee-7.1.x
Commit: a67401ef36a8182241e6ba125fc785db3c129dbf
Parents: 1175b81
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Aug 10 18:25:57 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 18:33:08 2018 +0100
----------------------------------------------------------------------
tomee/tomee-microprofile-webapp/pom.xml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a67401ef/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index ed460ca..84c4093 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -34,11 +34,6 @@
<name>OpenEJB :: TomEE :: MicroProfile Webapp</name>
<packaging>war</packaging>
- <properties>
- <microprofile.jwt.api.version>1.0</microprofile.jwt.api.version>
- <microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -62,7 +57,7 @@
<dependency>
<groupId>org.eclipse.microprofile.jwt</groupId>
<artifactId>microprofile-jwt-auth-api</artifactId>
- <version>${microprofile.jwt.api.version}</version>
+ <version>${microprofile.jwt.version}</version>
</dependency>
<dependency>