From f0b3e32508faddff1afbc426cdd0455f8cbe876e Mon Sep 17 00:00:00 2001 From: "Erdle, Tobias" Date: Mon, 12 Apr 2021 21:30:02 +0200 Subject: [PATCH] Remove CXF from testsuite and TCK Be aware that the Liberty profile is only commented out, as we will support this server again, as soon as they use RESTEasy. Because of this, the archive creator is adapted to use RESTEasy, so later we only need to remove the comments from the profiles and adapt the dependecies within the pom.xml. Signed-off-by: Erdle, Tobias --- tck/pom.xml | 98 ++++++++-------- .../krazo/tck/AbstractArchiveProvider.java | 4 - .../tck/liberty/LibertyArchiveProvider.java | 2 +- .../krazo/tck/tomee/TomeeArchiveProvider.java | 36 ------ .../tck/tomee/TomeeDevArchiveProvider.java | 47 -------- testsuite/pom.xml | 109 ++++++------------ 6 files changed, 83 insertions(+), 213 deletions(-) delete mode 100644 tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeArchiveProvider.java delete mode 100644 tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeDevArchiveProvider.java diff --git a/tck/pom.xml b/tck/pom.xml index 3f40140c..20f7a539 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -103,12 +103,6 @@ krazo-resteasy ${project.version} - - org.eclipse.krazo - krazo-cxf - ${project.version} - - @@ -266,53 +260,53 @@ - - tck-liberty - - - tck-env - liberty - - - - - - maven-surefire-plugin - - jakarta.mvc.tck:mvc-tck-tests - - liberty - - org.eclipse.krazo.tck.liberty.LibertyArchiveProvider - - - - - - - - - io.openliberty.arquillian - arquillian-liberty-managed-jakarta - 2.0.0-M1 - test - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - sonatype-oss-snapshots - Sonatype OSS Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - false - - - true - - - - + + + + + + + + + + + + + + diff --git a/tck/src/main/java/org/eclipse/krazo/tck/AbstractArchiveProvider.java b/tck/src/main/java/org/eclipse/krazo/tck/AbstractArchiveProvider.java index a2e91a92..9bd91632 100644 --- a/tck/src/main/java/org/eclipse/krazo/tck/AbstractArchiveProvider.java +++ b/tck/src/main/java/org/eclipse/krazo/tck/AbstractArchiveProvider.java @@ -72,10 +72,6 @@ protected File[] resolveKrazoRestEasy() { return resolveKrazoModule("org.eclipse.krazo", "krazo-resteasy"); } - protected File[] resolveKrazoCxf() { - return resolveKrazoModule("org.eclipse.krazo", "krazo-cxf"); - } - protected File[] resolveKrazoCore() { return resolveKrazoModule("org.eclipse.krazo", "krazo-core"); } diff --git a/tck/src/main/java/org/eclipse/krazo/tck/liberty/LibertyArchiveProvider.java b/tck/src/main/java/org/eclipse/krazo/tck/liberty/LibertyArchiveProvider.java index 50e803d4..4f9570f8 100644 --- a/tck/src/main/java/org/eclipse/krazo/tck/liberty/LibertyArchiveProvider.java +++ b/tck/src/main/java/org/eclipse/krazo/tck/liberty/LibertyArchiveProvider.java @@ -30,7 +30,7 @@ public class LibertyArchiveProvider extends AbstractArchiveProvider { public WebArchive getBaseArchive() { return ShrinkWrap.create(WebArchive.class) .addAsLibraries(resolveMvcSpecJar()) - .addAsLibraries(resolveKrazoCxf()); + .addAsLibraries(resolveKrazoRestEasy()); } } diff --git a/tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeArchiveProvider.java b/tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeArchiveProvider.java deleted file mode 100644 index 77b0c91e..00000000 --- a/tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeArchiveProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors - * - * Licensed 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. - * - * SPDX-License-Identifier: Apache-2.0 - */ -package org.eclipse.krazo.tck.tomee; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.eclipse.krazo.tck.AbstractArchiveProvider; - -/** - * BaseArchiveProvider implementation for running TCK against TomEE - */ -public class TomeeArchiveProvider extends AbstractArchiveProvider { - - @Override - public WebArchive getBaseArchive() { - return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(resolveMvcSpecJar()) - .addAsLibraries(resolveKrazoCxf()); - } - -} diff --git a/tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeDevArchiveProvider.java b/tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeDevArchiveProvider.java deleted file mode 100644 index 43d91bee..00000000 --- a/tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeDevArchiveProvider.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2019 Eclipse Krazo committers and contributors - * - * Licensed 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. - * - * SPDX-License-Identifier: Apache-2.0 - */ -package org.eclipse.krazo.tck.tomee; - -import org.eclipse.krazo.tck.AbstractArchiveProvider; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.importer.ExplodedImporter; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.shrinkwrap.api.spec.WebArchive; - -/** - * BaseArchiveProvider implementation for running TCK against TomEE - */ -public class TomeeDevArchiveProvider extends AbstractArchiveProvider { - - @Override - public WebArchive getBaseArchive() { - return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(resolveMvcSpecJar()) - .addAsLibraries( - ShrinkWrap.create(ExplodedImporter.class, "krazo-core.jar") - .importDirectory("../core/target/classes") - .as(JavaArchive.class) - ) - .addAsLibraries( - ShrinkWrap.create(ExplodedImporter.class, "krazo-cxf.jar") - .importDirectory("../cxf/target/classes") - .as(JavaArchive.class) - ); - } - -} diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 6305041f..d3c0a58c 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -335,79 +335,42 @@ - - testsuite-tomee - - - false - - - - - org.apache.tomee - arquillian-tomee-remote - 8.0.4 - test - - - org.eclipse.krazo - krazo-cxf - ${project.version} - runtime - - - - - - - maven-failsafe-plugin - - false - - tomee - testsuite-tomee - - - - - - - - testsuite-liberty - - - false - - - - - io.openliberty.arquillian - arquillian-liberty-managed - 1.0.6 - - - org.eclipse.krazo - krazo-cxf - ${project.version} - runtime - - - - - - - maven-failsafe-plugin - - false - - liberty - testsuite-liberty - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +