1:48 p.m.
Author: jolee
Date: 2014-05-28 14:48:10 -0400 (Wed, 28 May 2014)
New Revision: 4642
Modified:
branches/mvnTest/connectors/connector-infinispan/pom.xml
branches/mvnTest/documentation/javadocs/pom.xml
branches/mvnTest/jboss-integration/pom.xml
branches/mvnTest/metadata/pom.xml
Log:
BZ1054940 - Roll up patch EDS_5.3.1_1_2014 + TEIID-2945 + TEIID-2952 + TEIID-2930: SCROLL
keyword for DECLARE CURSOR not being parsed correctly (reprise)
Modified: branches/mvnTest/connectors/connector-infinispan/pom.xml
===================================================================
--- branches/mvnTest/connectors/connector-infinispan/pom.xml 2014-05-28 18:48:04 UTC (rev
4641)
+++ branches/mvnTest/connectors/connector-infinispan/pom.xml 2014-05-28 18:48:10 UTC (rev
4642)
@@ -154,7 +154,6 @@
<artifactId>commons-pool</artifactId>
<bundleDir>connector-infinispan.rar</bundleDir>
</javaModule>
- <!--
<jarModule>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
@@ -166,13 +165,11 @@
<artifactId>antlr</artifactId>
<excluded>true</excluded>
</jarModule>
- -->
<jarModule>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
<excluded>true</excluded>
</jarModule>
- <!--
<jarModule>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-commons-annotations</artifactId>
@@ -188,7 +185,6 @@
<artifactId>hibernate-core </artifactId>
<excluded>true</excluded>
</jarModule>
- -->
<jarModule>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
@@ -199,25 +195,21 @@
<artifactId>stax2-api </artifactId>
<excluded>true</excluded>
</jarModule>
- <!--
<jarModule>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<excluded>true</excluded>
</jarModule>
-
<jarModule>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<excluded>true</excluded>
</jarModule>
-
<jarModule>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<excluded>true</excluded>
</jarModule>
-
<jarModule>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
@@ -233,7 +225,6 @@
<artifactId>hsqldb</artifactId>
<excluded>true</excluded>
</jarModule>
- -->
<jarModule>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
Modified: branches/mvnTest/documentation/javadocs/pom.xml
===================================================================
--- branches/mvnTest/documentation/javadocs/pom.xml 2014-05-28 18:48:04 UTC (rev 4641)
+++ branches/mvnTest/documentation/javadocs/pom.xml 2014-05-28 18:48:10 UTC (rev 4642)
@@ -365,12 +365,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
<version>5.1.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api-3.0_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: branches/mvnTest/jboss-integration/pom.xml
===================================================================
--- branches/mvnTest/jboss-integration/pom.xml 2014-05-28 18:48:04 UTC (rev 4641)
+++ branches/mvnTest/jboss-integration/pom.xml 2014-05-28 18:48:10 UTC (rev 4642)
@@ -132,12 +132,6 @@
<artifactId>jboss-as-server</artifactId>
<version>5.1.0.GA</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api-3.0_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
Modified: branches/mvnTest/metadata/pom.xml
===================================================================
--- branches/mvnTest/metadata/pom.xml 2014-05-28 18:48:04 UTC (rev 4641)
+++ branches/mvnTest/metadata/pom.xml 2014-05-28 18:48:10 UTC (rev 4642)
@@ -63,12 +63,6 @@
<groupId>org.jboss.man</groupId>
<artifactId>jboss-managed</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.13.GA</version>
- </dependency>
</dependencies>