Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #153

This commit is contained in:
Martyn Taylor 2015-03-06 14:48:26 +00:00
parent d5ad8b2a5d 8ce007f4ab
commit 4142d75954
4 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NOTICE
View File

@ -14,11 +14,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
Certain portions of ActiveMQ are based on code made available
under the GNU Lesser General Public License, version 2.1 or later
(http://www.fsf.org/licensing/licenses/lgpl.html).
"JBoss" and "Red Hat" are trademarks of Red Hat, Inc. and/or its
affiliates, registered in the U.S. and other countries. Your
permissions under the licensing terms governing ActiveMQ do
not include a license, express or implied, to any Red Hat trademark.

1
tests/integration-tests/pom.xml
View File

@ -185,6 +185,7 @@
<dependency> <dependency>
<groupId>org.jboss.jbossts.jts</groupId> <groupId>org.jboss.jbossts.jts</groupId>
<artifactId>jbossjts-jacorb</artifactId> <artifactId>jbossjts-jacorb</artifactId>
<version>4.17.13.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss</groupId> <groupId>org.jboss</groupId>

1
tests/jms-tests/pom.xml
View File

@ -131,6 +131,7 @@
<dependency> <dependency>
<groupId>org.jboss.jbossts.jts</groupId> <groupId>org.jboss.jbossts.jts</groupId>
<artifactId>jbossjts-jacorb</artifactId> <artifactId>jbossjts-jacorb</artifactId>
<version>4.17.13.Final</version>
</dependency> </dependency>
</dependencies> </dependencies>

31
tests/pom.xml
View File

@ -34,15 +34,6 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- ## XA Dependencies ## -->
<dependency>
<groupId>org.jboss.jbossts.jts</groupId>
<artifactId>jbossjts-jacorb</artifactId>
<version>4.17.13.Final</version>
<!-- License: LGPL -->
</dependency>
<!-- ## End XA Dependencies ## -->
<!--## JMS Dependencies ## --> <!--## JMS Dependencies ## -->
<dependency> <dependency>
<groupId>org.apache.geronimo.components</groupId> <groupId>org.apache.geronimo.components</groupId>
@ -84,16 +75,24 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>banned-tests</id>
<modules> <modules>
<module>unit-tests</module>
<module>jms-tests</module> <module>jms-tests</module>
<module>joram-tests</module>
<module>soak-tests</module>
<module>stress-tests</module>
<module>timing-tests</module>
<module>concurrent-tests</module>
<module>performance-tests</module>
<module>integration-tests</module> <module>integration-tests</module>
<module>byteman-tests</module> <module>byteman-tests</module>
<module>soak-tests</module>
<module>stress-tests</module>
<module>concurrent-tests</module>
<module>performance-tests</module>
</modules>
</profile>
</profiles>
<modules>
<module>unit-tests</module>
<module>joram-tests</module>
<module>timing-tests</module>
</modules> </modules>
</project> </project>