This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 816d1cbda1 Use EE10 API, Fix RAT checks, un-ignore working test case
(as written on dev list)
816d1cbda1 is described below
commit 816d1cbda18c5bb7c036b00a4bc2e0819024130a
Author: Richard Zowalla <[email protected]>
AuthorDate: Wed Oct 23 20:35:02 2024 +0200
Use EE10 API, Fix RAT checks, un-ignore working test case (as written on
dev list)
---
.../tests/jaxrs/faces/AvoidConflictWithFacesTest.java | 2 --
.../functional-tests/spring-cxf-tomee-4332/pom.xml | 1 -
.../src/main/resources/application.properties | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/faces/AvoidConflictWithFacesTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/faces/AvoidConflictWithFacesTest.java
index 2be67b1cf9..8fe4fff032 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/faces/AvoidConflictWithFacesTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/faces/AvoidConflictWithFacesTest.java
@@ -26,7 +26,6 @@ import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import
org.jboss.shrinkwrap.descriptor.api.facesconfig22.WebFacesConfigDescriptor;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,7 +35,6 @@ import static org.junit.Assert.assertEquals;
// Test that reproduces https://issues.apache.org/jira/browse/TOMEE-4406
@RunWith(Arquillian.class)
-@Ignore
public class AvoidConflictWithFacesTest extends JaxrsTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
diff --git a/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
b/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
index 779fa10e28..93351b0779 100644
--- a/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
+++ b/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
@@ -66,7 +66,6 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/arquillian/functional-tests/spring-cxf-tomee-4332/src/main/resources/application.properties
b/arquillian/functional-tests/spring-cxf-tomee-4332/src/main/resources/application.properties
index 9b5b0cbca7..5758839e58 100644
---
a/arquillian/functional-tests/spring-cxf-tomee-4332/src/main/resources/application.properties
+++
b/arquillian/functional-tests/spring-cxf-tomee-4332/src/main/resources/application.properties
@@ -1 +1,17 @@
+#
+# 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.
+#
spring.mvc.servlet.path=/mvc
\ No newline at end of file
