activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [1/2] activemq-6 git commit: fixed test poms to exclude cat X tests modules
Date Fri, 06 Mar 2015 14:49:29 GMT
Repository: activemq-6
Updated Branches:
  refs/heads/master d5ad8b2a5 -> 4142d7595


fixed test poms to exclude cat X tests modules


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/8ce007f4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/8ce007f4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/8ce007f4

Branch: refs/heads/master
Commit: 8ce007f4ab23687e7a4e37436804c4973138f375
Parents: 969d02f
Author: Andy Taylor <andytaylor@apache.org>
Authored: Fri Mar 6 12:09:22 2015 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Fri Mar 6 14:23:50 2015 +0000

----------------------------------------------------------------------
 NOTICE                          |  8 --------
 tests/integration-tests/pom.xml |  1 +
 tests/jms-tests/pom.xml         |  1 +
 tests/pom.xml                   | 31 +++++++++++++++----------------
 4 files changed, 17 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8ce007f4/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index a0d0f9c..ef57849 100644
--- a/NOTICE
+++ b/NOTICE
@@ -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.
 See the License for the specific language governing permissions and
 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.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8ce007f4/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index bda1855..e246ee4 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -185,6 +185,7 @@
       <dependency>
          <groupId>org.jboss.jbossts.jts</groupId>
          <artifactId>jbossjts-jacorb</artifactId>
+         <version>4.17.13.Final</version>
       </dependency>
       <dependency>
          <groupId>org.jboss</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8ce007f4/tests/jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index a86a0ab..c31e32d 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -131,6 +131,7 @@
       <dependency>
          <groupId>org.jboss.jbossts.jts</groupId>
          <artifactId>jbossjts-jacorb</artifactId>
+         <version>4.17.13.Final</version>
       </dependency>
    </dependencies>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8ce007f4/tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/pom.xml b/tests/pom.xml
index 8b95a9b..7f4b176 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -34,15 +34,6 @@
 
    <dependencyManagement>
       <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 ## -->
          <dependency>
             <groupId>org.apache.geronimo.components</groupId>
@@ -84,16 +75,24 @@
       </plugins>
    </build>
 
+   <profiles>
+      <profile>
+         <id>banned-tests</id>
+         <modules>
+            <module>jms-tests</module>
+            <module>integration-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>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>byteman-tests</module>
    </modules>
 </project>


Mime
View raw message