This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 7bd6ef7fc [AMQ-8558] Remove activemq-itests-spring31 module
new 8936c1770 Merge pull request #830 from jbonofre/AMQ-8558
7bd6ef7fc is described below
commit 7bd6ef7fc49398a693fc18797a0e6557bf46d3b6
Author: Jean-Baptiste Onofré <[email protected]>
AuthorDate: Tue Apr 19 11:06:01 2022 +0200
[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(-)
diff --git a/activemq-itests-spring31/pom.xml b/activemq-itests-spring31/pom.xml
deleted file mode 100644
index 67c2250b2..000000000
--- a/activemq-itests-spring31/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
- <version>5.18.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-itests-spring31</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ :: Integration Test :: Spring 3.1</name>
- <description>ActiveMQ integration test with Spring 3.1</description>
-
- <properties>
- <!-- force using spring 3.1.x -->
- <spring-version>3.1.3.RELEASE</spring-version>
- </properties>
-
- <dependencies>
-
- <!-- =============================== -->
- <!-- Required Dependencies -->
- <!-- =============================== -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <!-- testing helpers -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-unit-tests</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <!-- Default - no tests -->
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
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 f62b51073..000000000
---
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 b69b1bbff..000000000
---
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 806f70c95..000000000
--- 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 93c1a1916..000000000
---
a/activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpring31Test-context.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<beans
- xmlns="http://www.springframework.org/schema/beans";
- xmlns:amq="http://activemq.apache.org/schema/core";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd";>
-
- <broker id="myBroker" useJmx="false" brokerName="myBroker"
persistent="false" xmlns="http://activemq.apache.org/schema/core";>
-
- <transportConnectors>
- <transportConnector uri="vm://myBroker" />
- </transportConnectors>
-
- </broker>
-
-</beans>
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 7f8d4faac..000000000
---
a/activemq-itests-spring31/src/test/resources/org/apache/activemq/itest/spring31/ActiveMQSpringProfile31Test-context.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<beans
- xmlns="http://www.springframework.org/schema/beans";
- xmlns:amq="http://activemq.apache.org/schema/core";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
- http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd";>
-
-<beans profile="cool">
-
- <broker id="myBroker" useJmx="false" brokerName="myBroker"
persistent="false" xmlns="http://activemq.apache.org/schema/core";>
-
- <transportConnectors>
- <transportConnector uri="vm://myBroker" />
- </transportConnectors>
-
- </broker>
-
- </beans>
-
-
-</beans>
diff --git a/pom.xml b/pom.xml
index d9dd0a44b..7aaf15775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,7 +234,6 @@
<module>activemq-web-demo</module>
<module>activemq-web-console</module>
<module>activemq-karaf-itest</module>
- <module>activemq-itests-spring31</module>
<module>assembly</module>
<module>activemq-log4j-appender</module>
<module>activemq-http</module>
