From 35f2d98de2c3ea8fc7a4b36822d3f5b971b734c6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 25 Nov 2021 15:45:35 +0000 Subject: [PATCH] Remove deployment tests for servers not Java 17 and EE 9 ready Closes gh-28815 --- .../OpenLibertyDeploymentTests.java | 47 ------------------- .../boot/deployment/TomEEDeploymentTests.java | 40 ---------------- .../deployment/WildflyDeploymentTests.java | 40 ---------------- 3 files changed, 127 deletions(-) delete mode 100644 spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/OpenLibertyDeploymentTests.java delete mode 100644 spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/TomEEDeploymentTests.java delete mode 100644 spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/WildflyDeploymentTests.java diff --git a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/OpenLibertyDeploymentTests.java b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/OpenLibertyDeploymentTests.java deleted file mode 100644 index e412eda826..0000000000 --- a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/OpenLibertyDeploymentTests.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * 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 - * - * https://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.springframework.boot.deployment; - -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -/** - * Deployment tests for Open Liberty. - * - * @author Christoph Dreis - * @author Scott Frederick - */ -@Testcontainers(disabledWithoutDocker = true) -class OpenLibertyDeploymentTests extends AbstractDeploymentTests { - - private static final int PORT = 9080; - - @Container - static WarDeploymentContainer container = new WarDeploymentContainer( - "openliberty/open-liberty:full-java8-openj9-ubi", "/config/dropins", PORT); - - @Override - WarDeploymentContainer getContainer() { - return container; - } - - @Override - protected int getPort() { - return PORT; - } - -} diff --git a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/TomEEDeploymentTests.java b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/TomEEDeploymentTests.java deleted file mode 100644 index 165debfa43..0000000000 --- a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/TomEEDeploymentTests.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * 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 - * - * https://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.springframework.boot.deployment; - -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -/** - * Deployment tests for TomEE. - * - * @author Christoph Dreis - * @author Scott Frederick - */ -@Testcontainers(disabledWithoutDocker = true) -class TomEEDeploymentTests extends AbstractDeploymentTests { - - @Container - static WarDeploymentContainer container = new WarDeploymentContainer("tomee:8", "/usr/local/tomee/webapps", - DEFAULT_PORT); - - @Override - WarDeploymentContainer getContainer() { - return container; - } - -} diff --git a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/WildflyDeploymentTests.java b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/WildflyDeploymentTests.java deleted file mode 100644 index 1ccf0170ef..0000000000 --- a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/WildflyDeploymentTests.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * 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 - * - * https://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.springframework.boot.deployment; - -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -/** - * Deployment tests for Wildfly. - * - * @author Christoph Dreis - * @author Scott Frederick - */ -@Testcontainers(disabledWithoutDocker = true) -class WildflyDeploymentTests extends AbstractDeploymentTests { - - @Container - static WarDeploymentContainer container = new WarDeploymentContainer("jboss/wildfly:latest", - "/opt/jboss/wildfly/standalone/deployments", DEFAULT_PORT); - - @Override - WarDeploymentContainer getContainer() { - return container; - } - -}