teiid SVN: r4646 - in branches/7.7.x: test-integration/common/src/test/java/org/teiid/transport and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-05-28 21:51:50 -0400 (Wed, 28 May 2014)
New Revision: 4646
Modified:
branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
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/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
===================================================================
--- branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2014-05-29 01:51:44 UTC (rev 4645)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2014-05-29 01:51:50 UTC (rev 4646)
@@ -149,8 +149,7 @@
private static Pattern preparedAutoIncrement = Pattern.compile("select 1 \\s*from pg_catalog.pg_attrdef \\s*where adrelid = \\$1 AND adnum = \\$2 " + //$NON-NLS-1$
"\\s*and pg_catalog.pg_get_expr\\(adbin, adrelid\\) \\s*like '%nextval\\(%'", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
-
- private static Pattern cursorSelectPattern = Pattern.compile("DECLARE\\s+\"(\\w+)\"(?:\\s+INSENSITIVE)?(\\s+(NO\\s+)?SCROLL)?\\s+CURSOR\\s+FOR\\s+(.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
+ private static Pattern cursorSelectPattern = Pattern.compile("DECLARE\\s+\"(\\w+)\"(?:\\s+INSENSITIVE)?(\\s+(NO\\s+)?SCROLL)?\\s+CURSOR\\s+(?:WITH(?:OUT)? HOLD\\s+)?FOR\\s+(.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
private static Pattern fetchPattern = Pattern.compile("FETCH (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern movePattern = Pattern.compile("MOVE (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern closePattern = Pattern.compile("CLOSE \"(\\w+)\"", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
Modified: branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-05-29 01:51:44 UTC (rev 4645)
+++ branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-05-29 01:51:50 UTC (rev 4646)
@@ -312,12 +312,11 @@
assertEquals("oid", rs.getArray("proargtypes").getBaseTypeName());
}
- // this does not work as JDBC always sends the queries in prepared form
- public void testPgDeclareCursor() throws Exception {
- Statement stmt = conn.createStatement();
- ResultSet rs = stmt.executeQuery("begin;declare \"foo\" cursor for select * from pg_proc;fetch 10 in \"foo\"; close \"foo\"");
- rs.next();
- }
+// @Test public void testCursor() throws Exception {
+// Statement stmt = conn.createStatement();
+// ResultSet rs = stmt.executeQuery("begin;declare \"foo\" cursor for select * from pg_proc;fetch 10 in \"foo\"; close \"foo\"");
+// rs.next();
+// }
// Introduces too many upstream dependencies, manual test against patched server needed.
// @Test public void testScrollCursor() throws Exception {
@@ -340,6 +339,26 @@
//
// }
+// Introduces too many upstream dependencies, manual test against patched server needed.
+// @Test public void testScrollCursorWithHold() throws Exception {
+// Statement stmt = conn.createStatement();
+// ExtendedQueryExectutorImpl.simplePortal = "foo";
+// try {
+// assertFalse(stmt.execute("declare \"foo\" insensitive scroll cursor with hold for select * from pg_proc;"));
+// assertFalse(stmt.execute("move 5 in \"foo\""));
+// stmt.execute("fetch 10 in \"foo\"");
+// ResultSet rs = stmt.getResultSet();
+// int rowCount = 0;
+// while (rs.next()) {
+// rowCount++;
+// }
+// assertEquals(6, rowCount);
+// stmt.execute("close \"foo\"");
+// } finally {
+// ExtendedQueryExectutorImpl.simplePortal = null;
+// }
+// }
+
@Test public void testPgProcedure() throws Exception {
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("select has_function_privilege(100, 'foo')");
11 years, 10 months
teiid SVN: r4645 - in branches/7.7.x: documentation/javadocs and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-05-28 21:51:44 -0400 (Wed, 28 May 2014)
New Revision: 4645
Modified:
branches/7.7.x/connectors/connector-infinispan/pom.xml
branches/7.7.x/documentation/javadocs/pom.xml
branches/7.7.x/jboss-integration/pom.xml
branches/7.7.x/metadata/pom.xml
Log:
Maven dependency changes for a successful local build
Modified: branches/7.7.x/connectors/connector-infinispan/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/pom.xml 2014-05-28 18:52:11 UTC (rev 4644)
+++ branches/7.7.x/connectors/connector-infinispan/pom.xml 2014-05-29 01:51:44 UTC (rev 4645)
@@ -154,6 +154,7 @@
<artifactId>commons-pool</artifactId>
<bundleDir>connector-infinispan.rar</bundleDir>
</javaModule>
+ <!--
<jarModule>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
@@ -165,11 +166,13 @@
<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>
@@ -185,6 +188,7 @@
<artifactId>hibernate-core </artifactId>
<excluded>true</excluded>
</jarModule>
+ -->
<jarModule>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
@@ -195,21 +199,25 @@
<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>
@@ -225,6 +233,7 @@
<artifactId>hsqldb</artifactId>
<excluded>true</excluded>
</jarModule>
+ -->
<jarModule>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
Modified: branches/7.7.x/documentation/javadocs/pom.xml
===================================================================
--- branches/7.7.x/documentation/javadocs/pom.xml 2014-05-28 18:52:11 UTC (rev 4644)
+++ branches/7.7.x/documentation/javadocs/pom.xml 2014-05-29 01:51:44 UTC (rev 4645)
@@ -365,6 +365,12 @@
<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/7.7.x/jboss-integration/pom.xml
===================================================================
--- branches/7.7.x/jboss-integration/pom.xml 2014-05-28 18:52:11 UTC (rev 4644)
+++ branches/7.7.x/jboss-integration/pom.xml 2014-05-29 01:51:44 UTC (rev 4645)
@@ -132,6 +132,12 @@
<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/7.7.x/metadata/pom.xml
===================================================================
--- branches/7.7.x/metadata/pom.xml 2014-05-28 18:52:11 UTC (rev 4644)
+++ branches/7.7.x/metadata/pom.xml 2014-05-29 01:51:44 UTC (rev 4645)
@@ -63,6 +63,12 @@
<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>
11 years, 10 months
[teiid/teiid] d003e4: TEIID-2974, TEIID-2972: fixing the bug in Excel me...
by Ramesh Reddy
Branch: refs/heads/master
Home: https://github.com/teiid/teiid
Commit: d003e4158009fa814972a1cc70d632299eab880e
https://github.com/teiid/teiid/commit/d003e4158009fa814972a1cc70d632299ea...
Author: Ramesh Reddy <rareddy(a)jboss.org>
Date: 2014-05-28 (Wed, 28 May 2014)
Changed paths:
M api/src/main/java/org/teiid/metadata/MetadataFactory.java
M connectors/translator-excel/src/main/java/org/teiid/translator/excel/ExcelMetadataProcessor.java
M connectors/translator-excel/src/test/java/org/teiid/translator/excel/TestExcelMetadataProcessor.java
A connectors/translator-loopback/.gitignore
M connectors/translator-mongodb/src/test/java/org/teiid/translator/mongodb/TestMongoDBMetadataProcessor.java
M engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java
M engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
M engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java
M engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
Log Message:
-----------
TEIID-2974, TEIID-2972: fixing the bug in Excel metadata properties definition, also DDL generation to include the SET namespace declaration for the built-in type namespaces and allow re definition of the builtin type with same prefix or some other prefix
Commit: 73c5965ea03304e6c687069cd0af3cc54e6e1ace
https://github.com/teiid/teiid/commit/73c5965ea03304e6c687069cd0af3cc54e6...
Author: Ramesh Reddy <rareddy(a)jboss.org>
Date: 2014-05-28 (Wed, 28 May 2014)
Changed paths:
M api/src/main/java/org/teiid/metadata/MetadataFactory.java
M connectors/translator-excel/src/main/java/org/teiid/translator/excel/ExcelMetadataProcessor.java
M connectors/translator-excel/src/test/java/org/teiid/translator/excel/TestExcelMetadataProcessor.java
A connectors/translator-loopback/.gitignore
M connectors/translator-mongodb/src/test/java/org/teiid/translator/mongodb/TestMongoDBMetadataProcessor.java
M engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java
M engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
M engine/src/test/java/org/teiid/query/metadata/TestDDLStringVisitor.java
M engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
Log Message:
-----------
Merge pull request #245 from rareddy/TEIID-2974
TEIID-2974, TEIID-2972: fixing the bug in Excel metadata properties defi...
Compare: https://github.com/teiid/teiid/compare/4d265d481104...73c5965ea033
11 years, 10 months
[teiid/teiid] 671a28: TEIID-2915: Adding kerberoes delegation to REST ba...
by Ramesh Reddy
Branch: refs/heads/master
Home: https://github.com/teiid/teiid
Commit: 671a280c641677a300f5ea51527d64adb1e7f218
https://github.com/teiid/teiid/commit/671a280c641677a300f5ea51527d64adb1e...
Author: Ramesh Reddy <rareddy(a)jboss.org>
Date: 2014-05-28 (Wed, 28 May 2014)
Changed paths:
M connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java
M connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java
M connectors/connector-ws/src/main/rar/META-INF/ra.xml
M connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties
M engine/src/main/java/org/teiid/dqp/service/GSSResult.java
M jboss-integration/src/main/java/org/teiid/jboss/JBossSessionService.java
M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
M runtime/src/main/java/org/teiid/transport/LogonImpl.java
Log Message:
-----------
TEIID-2915: Adding kerberoes delegation to REST based web service
Commit: 4d265d48110406b77261131f28e2adda82996556
https://github.com/teiid/teiid/commit/4d265d48110406b77261131f28e2adda829...
Author: Ramesh Reddy <rareddy(a)jboss.org>
Date: 2014-05-28 (Wed, 28 May 2014)
Changed paths:
M connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSConnectionImpl.java
M connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java
M connectors/connector-ws/src/main/rar/META-INF/ra.xml
M connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties
M engine/src/main/java/org/teiid/dqp/service/GSSResult.java
M jboss-integration/src/main/java/org/teiid/jboss/JBossSessionService.java
M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
M runtime/src/main/java/org/teiid/transport/LogonImpl.java
Log Message:
-----------
Merge pull request #244 from rareddy/TEIID-2915
TEIID-2915: Adding kerberoes delegation to REST based web service
Compare: https://github.com/teiid/teiid/compare/ef875b5dfd06...4d265d481104
11 years, 10 months
teiid SVN: r4644 - in branches/mvnTest: test-integration/common/src/test/java/org/teiid/transport and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-05-28 14:52:11 -0400 (Wed, 28 May 2014)
New Revision: 4644
Modified:
branches/mvnTest/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
branches/mvnTest/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
Log:
TEIID-2930: reprise SCROLL keyword for DECLARE CURSOR not being parsed correctly
Modified: branches/mvnTest/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
===================================================================
--- branches/mvnTest/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2014-05-28 18:52:04 UTC (rev 4643)
+++ branches/mvnTest/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2014-05-28 18:52:11 UTC (rev 4644)
@@ -149,8 +149,7 @@
private static Pattern preparedAutoIncrement = Pattern.compile("select 1 \\s*from pg_catalog.pg_attrdef \\s*where adrelid = \\$1 AND adnum = \\$2 " + //$NON-NLS-1$
"\\s*and pg_catalog.pg_get_expr\\(adbin, adrelid\\) \\s*like '%nextval\\(%'", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
-
- private static Pattern cursorSelectPattern = Pattern.compile("DECLARE\\s+\"(\\w+)\"(?:\\s+INSENSITIVE)?(\\s+(NO\\s+)?SCROLL)?\\s+CURSOR\\s+FOR\\s+(.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
+ private static Pattern cursorSelectPattern = Pattern.compile("DECLARE\\s+\"(\\w+)\"(?:\\s+INSENSITIVE)?(\\s+(NO\\s+)?SCROLL)?\\s+CURSOR\\s+(?:WITH(?:OUT)? HOLD\\s+)?FOR\\s+(.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
private static Pattern fetchPattern = Pattern.compile("FETCH (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern movePattern = Pattern.compile("MOVE (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern closePattern = Pattern.compile("CLOSE \"(\\w+)\"", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
Modified: branches/mvnTest/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- branches/mvnTest/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-05-28 18:52:04 UTC (rev 4643)
+++ branches/mvnTest/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-05-28 18:52:11 UTC (rev 4644)
@@ -312,12 +312,11 @@
assertEquals("oid", rs.getArray("proargtypes").getBaseTypeName());
}
- // this does not work as JDBC always sends the queries in prepared form
- public void testPgDeclareCursor() throws Exception {
- Statement stmt = conn.createStatement();
- ResultSet rs = stmt.executeQuery("begin;declare \"foo\" cursor for select * from pg_proc;fetch 10 in \"foo\"; close \"foo\"");
- rs.next();
- }
+// @Test public void testCursor() throws Exception {
+// Statement stmt = conn.createStatement();
+// ResultSet rs = stmt.executeQuery("begin;declare \"foo\" cursor for select * from pg_proc;fetch 10 in \"foo\"; close \"foo\"");
+// rs.next();
+// }
// Introduces too many upstream dependencies, manual test against patched server needed.
// @Test public void testScrollCursor() throws Exception {
@@ -340,6 +339,26 @@
//
// }
+// Introduces too many upstream dependencies, manual test against patched server needed.
+// @Test public void testScrollCursorWithHold() throws Exception {
+// Statement stmt = conn.createStatement();
+// ExtendedQueryExectutorImpl.simplePortal = "foo";
+// try {
+// assertFalse(stmt.execute("declare \"foo\" insensitive scroll cursor with hold for select * from pg_proc;"));
+// assertFalse(stmt.execute("move 5 in \"foo\""));
+// stmt.execute("fetch 10 in \"foo\"");
+// ResultSet rs = stmt.getResultSet();
+// int rowCount = 0;
+// while (rs.next()) {
+// rowCount++;
+// }
+// assertEquals(6, rowCount);
+// stmt.execute("close \"foo\"");
+// } finally {
+// ExtendedQueryExectutorImpl.simplePortal = null;
+// }
+// }
+
@Test public void testPgProcedure() throws Exception {
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("select has_function_privilege(100, 'foo')");
11 years, 10 months
teiid SVN: r4643 - in branches/mvnTest: documentation/javadocs and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-05-28 14:52:04 -0400 (Wed, 28 May 2014)
New Revision: 4643
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:
Maven dependency changes for a successful local build
Modified: branches/mvnTest/connectors/connector-infinispan/pom.xml
===================================================================
--- branches/mvnTest/connectors/connector-infinispan/pom.xml 2014-05-28 18:48:10 UTC (rev 4642)
+++ branches/mvnTest/connectors/connector-infinispan/pom.xml 2014-05-28 18:52:04 UTC (rev 4643)
@@ -154,6 +154,7 @@
<artifactId>commons-pool</artifactId>
<bundleDir>connector-infinispan.rar</bundleDir>
</javaModule>
+ <!--
<jarModule>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
@@ -165,11 +166,13 @@
<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>
@@ -185,6 +188,7 @@
<artifactId>hibernate-core </artifactId>
<excluded>true</excluded>
</jarModule>
+ -->
<jarModule>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
@@ -195,21 +199,25 @@
<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>
@@ -225,6 +233,7 @@
<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:10 UTC (rev 4642)
+++ branches/mvnTest/documentation/javadocs/pom.xml 2014-05-28 18:52:04 UTC (rev 4643)
@@ -365,6 +365,12 @@
<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:10 UTC (rev 4642)
+++ branches/mvnTest/jboss-integration/pom.xml 2014-05-28 18:52:04 UTC (rev 4643)
@@ -132,6 +132,12 @@
<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:10 UTC (rev 4642)
+++ branches/mvnTest/metadata/pom.xml 2014-05-28 18:52:04 UTC (rev 4643)
@@ -63,6 +63,12 @@
<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>
11 years, 10 months
teiid SVN: r4642 - in branches/mvnTest: documentation/javadocs and 2 other directories.
by teiid-commits＠lists.jboss.org
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>
11 years, 10 months
teiid SVN: r4641 - in branches/mvnTest: documentation/javadocs and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-05-28 14:48:04 -0400 (Wed, 28 May 2014)
New Revision: 4641
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:
Maven dependency changes for a successful local build
Modified: branches/mvnTest/connectors/connector-infinispan/pom.xml
===================================================================
--- branches/mvnTest/connectors/connector-infinispan/pom.xml 2014-05-28 17:31:30 UTC (rev 4640)
+++ branches/mvnTest/connectors/connector-infinispan/pom.xml 2014-05-28 18:48:04 UTC (rev 4641)
@@ -154,6 +154,7 @@
<artifactId>commons-pool</artifactId>
<bundleDir>connector-infinispan.rar</bundleDir>
</javaModule>
+ <!--
<jarModule>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
@@ -165,11 +166,13 @@
<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>
@@ -185,6 +188,7 @@
<artifactId>hibernate-core </artifactId>
<excluded>true</excluded>
</jarModule>
+ -->
<jarModule>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
@@ -195,21 +199,25 @@
<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>
@@ -225,6 +233,7 @@
<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 17:31:30 UTC (rev 4640)
+++ branches/mvnTest/documentation/javadocs/pom.xml 2014-05-28 18:48:04 UTC (rev 4641)
@@ -365,6 +365,12 @@
<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 17:31:30 UTC (rev 4640)
+++ branches/mvnTest/jboss-integration/pom.xml 2014-05-28 18:48:04 UTC (rev 4641)
@@ -132,6 +132,12 @@
<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 17:31:30 UTC (rev 4640)
+++ branches/mvnTest/metadata/pom.xml 2014-05-28 18:48:04 UTC (rev 4641)
@@ -63,6 +63,12 @@
<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>
11 years, 10 months
