From 7bd6ef7fc49398a693fc18797a0e6557bf46d3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Tue, 19 Apr 2022 11:06:01 +0200 Subject: [PATCH] [AMQ-8558] Remove activemq-itests-spring31 module --- activemq-itests-spring31/pom.xml | 107 ------------------ .../itest/spring31/ActiveMQSpring31Test.java | 35 ------ .../spring31/ActiveMQSpringProfile31Test.java | 43 ------- .../src/test/resources/log4j.properties | 35 ------ .../spring31/ActiveMQSpring31Test-context.xml | 33 ------ .../ActiveMQSpringProfile31Test-context.xml | 38 ------- pom.xml | 1 - 7 files changed, 292 deletions(-) delete mode 100644 activemq-itests-spring31/pom.xml delete mode 100644 activemq-itests-spring31/src/test/java/org/apache/activemq/itest/spring31/ActiveMQSpring31Test.java delete mode 100644 activemq-itests-spring31/src/test/java/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test.java delete mode 100644 activemq-itests-spring31/src/test/resources/log4j.properties delete mode 100644 activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpring31Test-context.xml delete mode 100644 activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test-context.xml diff --git a/activemq-itests-spring31/pom.xml b/activemq-itests-spring31/pom.xml deleted file mode 100644 index 67c2250b26..0000000000 --- a/activemq-itests-spring31/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - 4.0.0 - - - org.apache.activemq - activemq-parent - 5.18.0-SNAPSHOT - - - activemq-itests-spring31 - jar - ActiveMQ :: Integration Test :: Spring 3.1 - ActiveMQ integration test with Spring 3.1 - - - - 3.1.3.RELEASE - - - - - - - - - org.slf4j - slf4j-api - - - - - ${project.groupId} - activemq-unit-tests - test-jar - test - - - junit - junit - test - - - org.apache.xbean - xbean-spring - test - - - ${project.groupId} - activemq-spring - test - - - org.springframework - spring-test - test - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - org.apache.logging.log4j - log4j-core - test - - - - - - - default - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - - diff --git a/activemq-itests-spring31/src/test/java/org/apache/activemq/itest/spring31/ActiveMQSpring31Test.java b/activemq-itests-spring31/src/test/java/org/apache/activemq/itest/spring31/ActiveMQSpring31Test.java deleted file mode 100644 index f62b510734..0000000000 --- a/activemq-itests-spring31/src/test/java/org/apache/activemq/itest/spring31/ActiveMQSpring31Test.java +++ /dev/null @@ -1,35 +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.activemq.itest.spring31; - -import org.junit.Test; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - -import static org.junit.Assert.assertNotNull; - -/** - * - */ -@ContextConfiguration -public class ActiveMQSpring31Test extends AbstractJUnit4SpringContextTests { - - @Test - public void testSpring31() throws Exception { - assertNotNull("Should find broker", applicationContext.getBean("myBroker")); - } -} diff --git a/activemq-itests-spring31/src/test/java/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test.java b/activemq-itests-spring31/src/test/java/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test.java deleted file mode 100644 index b69b1bbff8..0000000000 --- a/activemq-itests-spring31/src/test/java/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test.java +++ /dev/null @@ -1,43 +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.activemq.itest.spring31; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.context.annotation.Profile; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import static org.junit.Assert.assertNotNull; - -/** - * - */ -@ContextConfiguration -@RunWith(SpringJUnit4ClassRunner.class) -@ActiveProfiles("cool") -@Ignore("AMQ-3723") -public class ActiveMQSpringProfile31Test extends AbstractJUnit4SpringContextTests { - - @Test - public void testSpringProfile31() throws Exception { - assertNotNull("Should find broker", applicationContext.getBean("myBroker")); - } -} diff --git a/activemq-itests-spring31/src/test/resources/log4j.properties b/activemq-itests-spring31/src/test/resources/log4j.properties deleted file mode 100644 index 806f70c954..0000000000 --- a/activemq-itests-spring31/src/test/resources/log4j.properties +++ /dev/null @@ -1,35 +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. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, out, stdout - -#log4j.logger.org.apache.activemq=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.out=org.apache.log4j.FileAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.out.file=target/activemq-itest-spring31.log -log4j.appender.out.append=true diff --git a/activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpring31Test-context.xml b/activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpring31Test-context.xml deleted file mode 100644 index 93c1a19168..0000000000 --- a/activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpring31Test-context.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test-context.xml b/activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test-context.xml deleted file mode 100644 index 7f8d4faac2..0000000000 --- a/activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test-context.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index d9dd0a44ba..7aaf157757 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,6 @@ activemq-web-demo activemq-web-console activemq-karaf-itest - activemq-itests-spring31 assembly activemq-log4j-appender activemq-http