This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 274b5056b7 Fix BVal JavaFX dependency missing in the webapp
274b5056b7 is described below
commit 274b5056b745c7b3835c7f7b05066ee199fea27b
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Thu Jun 2 12:11:10 2022 +0200
Fix BVal JavaFX dependency missing in the webapp
---
.../tomee/bval/tck/BValTCKArchiveProcessor.java | 36 ++++++++++++++++++++++
.../apache/tomee/bval/tck/BValTCKExtension.java | 29 +++++++++++++++++
...org.jboss.arquillian.core.spi.LoadableExtension | 1 +
tck/bval-tomee/src/test/resources/arquillian.xml | 16 ----------
4 files changed, 66 insertions(+), 16 deletions(-)
diff --git
a/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
new file mode 100644
index 0000000000..c2becc1ff3
--- /dev/null
+++
b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
@@ -0,0 +1,36 @@
+/*
+ * 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.bval.tck;
+
+import com.sun.javafx.PlatformUtil;
+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.spec.WebArchive;
+
+import static org.apache.openejb.loader.JarLocation.jarLocation;
+
+public class BValTCKArchiveProcessor implements ApplicationArchiveProcessor {
+ @Override
+ public void process(final Archive<?> archive, final TestClass testClass) {
+ if (archive instanceof WebArchive) {
+
WebArchive.class.cast(archive).addAsLibrary(jarLocation(PlatformUtil.class));
+ }
+ }
+}
diff --git
a/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKExtension.java
b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKExtension.java
new file mode 100644
index 0000000000..1e76d8b396
--- /dev/null
+++
b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKExtension.java
@@ -0,0 +1,29 @@
+/*
+ * 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.bval.tck;
+
+import
org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
+import org.jboss.arquillian.core.spi.LoadableExtension;
+
+public class BValTCKExtension implements LoadableExtension {
+ @Override
+ public void register(final ExtensionBuilder extensionBuilder) {
+ extensionBuilder.service(ApplicationArchiveProcessor.class,
BValTCKArchiveProcessor.class);
+ }
+}
diff --git
a/tck/bval-tomee/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
b/tck/bval-tomee/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
new file mode 100644
index 0000000000..355f0bf564
--- /dev/null
+++
b/tck/bval-tomee/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+org.apache.tomee.bval.tck.BValTCKExtension
diff --git a/tck/bval-tomee/src/test/resources/arquillian.xml
b/tck/bval-tomee/src/test/resources/arquillian.xml
index d5e75cae31..34a6216a69 100644
--- a/tck/bval-tomee/src/test/resources/arquillian.xml
+++ b/tck/bval-tomee/src/test/resources/arquillian.xml
@@ -34,22 +34,6 @@
<property name="simpleLog">true</property>
<property name="properties">
validation.provider = org.apache.bval.jsr.ApacheValidationProvider
-
- # disable our filtering feature for TCK - but it is important to keep
it at runtime since
- # that's what users rely on
- #
- # note: this config just drop ValidationProvider from this list
- #
- openejb.classloader.filterable-resources = \
- META-INF/services/jakarta.ws.rs.client.ClientBuilder,\
- META-INF/services/jakarta.json.spi.JsonProvider,\
- META-INF/services/javax.cache.spi.CachingProvider,\
-
META-INF/javamail.default.providers,META-INF/javamail.default.address.map,\
- META-INF/javamail.charset.map,META-INF/mailcap,\
- org/slf4j/impl/StaticLoggerBinder.class
- </property>
- <property name="additionalLibs">
- mvn:org.openjfx:javafx-base:11
</property>
</configuration>
</container>
