Author: rvesse
Date: Wed Jul 3 20:24:31 2013
New Revision: 1499543
URL: http://svn.apache.org/r1499543
Log:
Update dependency and POM versions
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-core/pom.xml
jena/Experimental/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
jena/Experimental/jena-jdbc/jena-jdbc-driver-mem/pom.xml
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/pom.xml
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
jena/Experimental/jena-jdbc/pom.xml
Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/pom.xml?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/pom.xml (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/pom.xml Wed Jul 3 20:24:31 2013
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</parent>
<artifactId>jena-jdbc-core</artifactId>
<name>Jena JDBC - Core</name>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
- <version>2.10.1</version>
+ <version>2.10.2-SNAPSHOT</version>
</dependency>
<!-- Test Dependencies -->
Modified: jena/Experimental/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-bundle/pom.xml?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-driver-bundle/pom.xml (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-driver-bundle/pom.xml Wed Jul 3
20:24:31 2013
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</parent>
<artifactId>jena-jdbc-driver-bundle</artifactId>
<name>Jena JDBC - Driver Bundle</name>
@@ -19,7 +19,7 @@
EMMA plugin having limited configurability and making
it otherwise impossible
to easily analyse code coverage on a multi-module
project short of running
the Emma plugin on your Jenkins server, however doing
that loses the visual
- benefit of being to see in Eclipse what code is not
covered -->
+ benefit of being to see in Eclipse what code is and
isn't covered -->
<skipTests>true</skipTests>
</properties>
@@ -27,17 +27,17 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-driver-mem</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-driver-remote</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-driver-tdb</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<!-- Test Dependencies -->
Modified: jena/Experimental/jena-jdbc/jena-jdbc-driver-mem/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-mem/pom.xml?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-driver-mem/pom.xml (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-driver-mem/pom.xml Wed Jul 3
20:24:31 2013
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</parent>
<artifactId>jena-jdbc-driver-mem</artifactId>
<name>Jena JDBC - In-Memory Driver</name>
@@ -18,14 +18,14 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-core</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-core</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified: jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/pom.xml?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/pom.xml (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/pom.xml Wed Jul 3
20:24:31 2013
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</parent>
<artifactId>jena-jdbc-driver-remote</artifactId>
<name>Jena JDBC - Remote Endpoint Driver</name>
@@ -18,26 +18,26 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-core</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-core</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
- <version>0.2.7</version>
+ <version>0.2.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
- <version>0.2.7</version>
+ <version>0.2.8-SNAPSHOT</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
---
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java
(original)
+++
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java
Wed Jul 3 20:24:31 2013
@@ -19,7 +19,6 @@
package org.apache.jena.jdbc.remote.connections;
import java.sql.SQLException;
-import org.apache.jena.fuseki.BaseServerTest;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.AbstractJenaConnectionTests;
@@ -70,14 +69,14 @@ public class TestRemoteEndpointConnectio
@Override
protected JenaConnection getConnection() throws SQLException {
- return new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
+ return new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
}
@Override
protected JenaConnection getConnection(Dataset ds) throws SQLException {
// Set up the dataset
- TestUtils.copyToRemoteDataset(ds, BaseServerTest.serviceREST);
- return new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
+ TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST);
+ return new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
}
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
---
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java
(original)
+++
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java
Wed Jul 3 20:24:31 2013
@@ -22,7 +22,6 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jena.fuseki.BaseServerTest;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.AbstractJenaConnectionTests;
@@ -81,7 +80,7 @@ public class TestRemoteEndpointConnectio
protected JenaConnection getConnection() throws SQLException {
List<String> defaultGraphs = new ArrayList<String>();
defaultGraphs.add(DEFAULT_GRAPH_URI);
- return new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, defaultGraphs, null, defaultGraphs, null, null,
null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null,
null);
+ return new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, defaultGraphs, null, defaultGraphs, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null);
}
@Override
@@ -92,8 +91,8 @@ public class TestRemoteEndpointConnectio
// Set up the dataset
ds = TestUtils.renameGraph(ds, null, DEFAULT_GRAPH_URI);
Assert.assertEquals(0, ds.getDefaultModel().size());
- TestUtils.copyToRemoteDataset(ds, BaseServerTest.serviceREST);
- return new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
+ TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST);
+ return new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
}
@Override
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
---
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java
(original)
+++
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java
Wed Jul 3 20:24:31 2013
@@ -19,7 +19,6 @@
package org.apache.jena.jdbc.remote.connections;
import java.sql.SQLException;
-import org.apache.jena.fuseki.BaseServerTest;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.AbstractJenaConnectionTests;
@@ -71,13 +70,13 @@ public class TestRemoteEndpointConnectio
@Override
protected JenaConnection getConnection() throws SQLException {
- return new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, null, null, null, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT,
WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson);
+ return new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, null, null, null, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT,
WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson);
}
@Override
protected JenaConnection getConnection(Dataset ds) throws SQLException {
// Set up the dataset
- TestUtils.copyToRemoteDataset(ds, BaseServerTest.serviceREST);
- return new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, null, null, null, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT,
WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson);
+ TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST);
+ return new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, null, null, null, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT,
WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson);
}
}
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
---
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java
(original)
+++
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java
Wed Jul 3 20:24:31 2013
@@ -24,7 +24,6 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jena.fuseki.BaseServerTest;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
@@ -66,7 +65,7 @@ public class TestRemoteConnectionMetadat
@Override
protected JenaConnection getConnection() throws SQLException {
- return new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
+ return new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
}
@Override
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
---
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
(original)
+++
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
Wed Jul 3 20:24:31 2013
@@ -22,7 +22,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.jena.fuseki.BaseServerTest;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
@@ -51,7 +50,7 @@ public class TestRemoteEndpointResults e
public static void setup() throws SQLException {
ServerTest.allocServer();
- connection = new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
+ connection = new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
connection.setJdbcCompatibilityLevel(JdbcCompatibility.HIGH);
}
@@ -81,7 +80,7 @@ public class TestRemoteEndpointResults e
@Override
protected ResultSet createResults(Dataset ds, String query, int
resultSetType) throws SQLException {
- TestUtils.copyToRemoteDataset(ds, BaseServerTest.serviceREST);
+ TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST);
Statement stmt = connection.createStatement(resultSetType,
ResultSet.CONCUR_READ_ONLY);
return stmt.executeQuery(query);
}
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
---
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
(original)
+++
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
Wed Jul 3 20:24:31 2013
@@ -24,7 +24,6 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jena.fuseki.BaseServerTest;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
@@ -61,7 +60,7 @@ public class TestRemoteEndpointResultsWi
List<String> defaultGraphUris = new ArrayList<String>();
defaultGraphUris.add(DEFAULT_GRAPH_URI);
- connection = new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, defaultGraphUris, null, null, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null);
+ connection = new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, defaultGraphUris, null, null, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null);
connection.setJdbcCompatibilityLevel(JdbcCompatibility.HIGH);
}
@@ -92,7 +91,7 @@ public class TestRemoteEndpointResultsWi
@Override
protected ResultSet createResults(Dataset ds, String query, int
resultSetType) throws SQLException {
ds = TestUtils.renameGraph(ds, null, DEFAULT_GRAPH_URI);
- TestUtils.copyToRemoteDataset(ds, BaseServerTest.serviceREST);
+ TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST);
Statement stmt = connection.createStatement(resultSetType,
ResultSet.CONCUR_READ_ONLY);
return stmt.executeQuery(query);
}
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
---
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
(original)
+++
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
Wed Jul 3 20:24:31 2013
@@ -21,7 +21,6 @@ package org.apache.jena.jdbc.remote.resu
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.jena.fuseki.BaseServerTest;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
@@ -51,7 +50,7 @@ public class TestRemoteEndpointResultsWi
public static void setup() throws SQLException {
ServerTest.allocServer();
- connection = new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, null, null, null, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT,
WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson);
+ connection = new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, null, null, null, null, null, null,
JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT,
WebContent.contentTypeTextTSV, WebContent.contentTypeRdfJson);
connection.setJdbcCompatibilityLevel(JdbcCompatibility.HIGH);
}
@@ -81,7 +80,7 @@ public class TestRemoteEndpointResultsWi
@Override
protected ResultSet createResults(Dataset ds, String query, int
resultSetType) throws SQLException {
- TestUtils.copyToRemoteDataset(ds, BaseServerTest.serviceREST);
+ TestUtils.copyToRemoteDataset(ds, ServerTest.serviceREST);
Statement stmt = connection.createStatement(resultSetType,
ResultSet.CONCUR_READ_ONLY);
return stmt.executeQuery(query);
}
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
---
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java
(original)
+++
jena/Experimental/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java
Wed Jul 3 20:24:31 2013
@@ -19,7 +19,6 @@
package org.apache.jena.jdbc.remote.statements;
import java.sql.SQLException;
-import org.apache.jena.fuseki.BaseServerTest;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
@@ -61,7 +60,7 @@ public class TestRemoteEndpointStatement
@Override
protected JenaConnection getConnection() throws SQLException {
- return new RemoteEndpointConnection(BaseServerTest.serviceQuery,
BaseServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
+ return new RemoteEndpointConnection(ServerTest.serviceQuery,
ServerTest.serviceUpdate, JenaConnection.DEFAULT_HOLDABILITY,
JdbcCompatibility.DEFAULT);
}
Modified: jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/pom.xml?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/pom.xml (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/pom.xml Wed Jul 3
20:24:31 2013
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</parent>
<artifactId>jena-jdbc-driver-tdb</artifactId>
<name>Jena JDBC - TDB Driver</name>
@@ -18,12 +18,12 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-core</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb</artifactId>
- <version>0.10.1</version>
+ <version>0.10.2-SNAPSHOT</version>
</dependency>
<!-- Test Dependencies -->
@@ -36,14 +36,14 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-core</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc-driver-mem</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Modified: jena/Experimental/jena-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/pom.xml?rev=1499543&r1=1499542&r2=1499543&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/pom.xml (original)
+++ jena/Experimental/jena-jdbc/pom.xml Wed Jul 3 20:24:31 2013
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jena</groupId>
<artifactId>jena-jdbc</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jena JDBC</name>
<description>This is the parent module for the Jena JDBC modules.
These modules provide JDBC Type 4 drivers for in-memory and TDB datasets as
well as remote SPARQL endpoints.</description>
@@ -98,9 +98,13 @@
<execution>
<phase>package</phase>
<goals>
- <!-- Product aggregate
documentation - this is what would get published -->
- <goal>aggregate</goal>
-
<goal>aggregate-jar</goal>
+ <!--
+ Product aggregate
documentation - this is what would get published
+
+ Only downside to this
approach is that when you bump versions you have to disable the goals
temporarily
+ -->
+ <!--
<goal>aggregate</goal>
+
<goal>aggregate-jar</goal>-->
</goals>
</execution>
</executions>