You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/01/02 20:36:25 UTC
[1/7] jena git commit: JENA-778 : Implement find(Triple)
Repository: jena
Updated Branches:
refs/heads/master b6a4bbc91 -> f2efcb10a
JENA-778 : Implement find(Triple)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/529ba413
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/529ba413
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/529ba413
Branch: refs/heads/master
Commit: 529ba413e9dbeeb06bb747df6110d8dcf935996b
Parents: b6a4bbc
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jan 2 17:07:31 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jan 2 17:07:31 2015 +0000
----------------------------------------------------------------------
.../propertytable/graph/GraphPropertyTable.java | 44 ++++++++++----------
1 file changed, 21 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/529ba413/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java
----------------------------------------------------------------------
diff --git a/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java b/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java
index 3f1e930..7eeed50 100644
--- a/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java
+++ b/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java
@@ -18,24 +18,22 @@
package org.apache.jena.propertytable.graph;
-import java.util.ArrayList;
-import java.util.Locale;
-
-import org.apache.jena.propertytable.Column;
-import org.apache.jena.propertytable.PropertyTable;
-import org.apache.jena.propertytable.Row;
-
-
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
-import com.hp.hpl.jena.graph.impl.GraphBase;
-import com.hp.hpl.jena.sparql.core.BasicPattern;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.util.iterator.Filter;
-import com.hp.hpl.jena.util.iterator.NullIterator;
-import com.hp.hpl.jena.util.iterator.WrappedIterator;
+import java.util.ArrayList ;
+import java.util.Locale ;
+
+import org.apache.jena.propertytable.Column ;
+import org.apache.jena.propertytable.PropertyTable ;
+import org.apache.jena.propertytable.Row ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.impl.GraphBase ;
+import com.hp.hpl.jena.sparql.core.BasicPattern ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.Filter ;
+import com.hp.hpl.jena.util.iterator.NullIterator ;
+import com.hp.hpl.jena.util.iterator.WrappedIterator ;
/**
* GraphPropertyTable implements the Graph interface (read-only) over a PropertyTable.
@@ -57,7 +55,7 @@ public class GraphPropertyTable extends GraphBase {
}
@Override
- protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m) {
+ protected ExtendedIterator<Triple> graphBaseFind(Triple triple) {
//System.out.println(m);
if (this.pt == null) {
@@ -66,9 +64,9 @@ public class GraphPropertyTable extends GraphBase {
ExtendedIterator<Triple> iter = null;
- Node s = m.getMatchSubject();
- Node p = m.getMatchPredicate();
- Node o = m.getMatchObject();
+ Node s = triple.getMatchSubject();
+ Node p = triple.getMatchPredicate();
+ Node o = triple.getMatchObject();
if (isConcrete(p) && isConcrete(o)) {
//System.out.println("1");
@@ -89,7 +87,7 @@ public class GraphPropertyTable extends GraphBase {
iter = pt.getTripleIterator();
}
- return iter.filterKeep(new TripleMatchFilterEquality(m.asTriple()));
+ return iter.filterKeep(new TripleMatchFilterEquality(triple));
}
[5/7] jena git commit: Fix target JDK on maven-pmd-plugin config
Posted by an...@apache.org.
Fix target JDK on maven-pmd-plugin config
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9fc0e4f8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9fc0e4f8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9fc0e4f8
Branch: refs/heads/master
Commit: 9fc0e4f82a76fb34771a3aac93241ca7b9453c1a
Parents: eb0ac76
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jan 2 17:50:02 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jan 2 17:50:02 2015 +0000
----------------------------------------------------------------------
jena-parent/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9fc0e4f8/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 9cc0cea..e185fb2 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -685,7 +685,6 @@
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
- <targetJdk>1.6</targetJdk>
</configuration>
</plugin>
[4/7] jena git commit: JENA-778 : Updates for deprecation of
TripleMatch
Posted by an...@apache.org.
JENA-778 : Updates for deprecation of TripleMatch
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/eb0ac769
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/eb0ac769
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/eb0ac769
Branch: refs/heads/master
Commit: eb0ac769ab87d8a734b2ce136e34b61129898d4c
Parents: 3d1336d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jan 2 17:48:42 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jan 2 17:48:42 2015 +0000
----------------------------------------------------------------------
.../jena/security/graph/SecuredGraph.java | 38 +++++++-----
.../security/graph/impl/SecuredGraphImpl.java | 64 ++++++++++----------
2 files changed, 56 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/eb0ac769/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraph.java
----------------------------------------------------------------------
diff --git a/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraph.java b/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraph.java
index 4aca683..d9ec257 100644
--- a/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraph.java
+++ b/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraph.java
@@ -17,18 +17,17 @@
*/
package org.apache.jena.security.graph;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.GraphStatisticsHandler;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
-import com.hp.hpl.jena.shared.AddDeniedException;
-import com.hp.hpl.jena.shared.DeleteDeniedException;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-
-import org.apache.jena.security.AccessDeniedException;
-import org.apache.jena.security.SecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator.SecNode;
+import org.apache.jena.security.AccessDeniedException ;
+import org.apache.jena.security.SecurityEvaluator ;
+import org.apache.jena.security.SecurityEvaluator.SecNode ;
+
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphStatisticsHandler ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.shared.AddDeniedException ;
+import com.hp.hpl.jena.shared.DeleteDeniedException ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
/**
* The interface for secured Graph instances.
@@ -91,13 +90,24 @@ public interface SecuredGraph extends Graph
public ExtendedIterator<Triple> find( final Node s, final Node p,
final Node o ) throws AccessDeniedException;
- /**
+ /**
+ * @sec.graph Read
+ * @sec.triple Read, otherwise filtered from iterator.
+ * @throws AccessDeniedException
+ * @deprecated Use {@link #find(Triple)}
+ */
+ @Deprecated
+ @Override
+ public ExtendedIterator<Triple> find( final com.hp.hpl.jena.graph.TripleMatch triple )
+ throws AccessDeniedException;
+
+ /**
* @sec.graph Read
* @sec.triple Read, otherwise filtered from iterator.
* @throws AccessDeniedException
*/
@Override
- public ExtendedIterator<Triple> find( final TripleMatch m )
+ public ExtendedIterator<Triple> find( final Triple triple )
throws AccessDeniedException;
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/eb0ac769/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java
----------------------------------------------------------------------
diff --git a/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java b/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java
index 1f5a5af..bcb3857 100644
--- a/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java
+++ b/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java
@@ -17,27 +17,18 @@
*/
package org.apache.jena.security.graph.impl;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.GraphStatisticsHandler;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.TransactionHandler;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
-import com.hp.hpl.jena.shared.AddDeniedException;
-import com.hp.hpl.jena.shared.DeleteDeniedException;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.security.SecurityEvaluator ;
+import org.apache.jena.security.SecurityEvaluator.Action ;
+import org.apache.jena.security.graph.* ;
+import org.apache.jena.security.impl.ItemHolder ;
+import org.apache.jena.security.impl.SecuredItem ;
+import org.apache.jena.security.impl.SecuredItemImpl ;
+import org.apache.jena.security.utils.PermTripleFilter ;
-import org.apache.jena.security.SecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator.Action;
-import org.apache.jena.security.graph.SecuredBulkUpdateHandler;
-import org.apache.jena.security.graph.SecuredCapabilities;
-import org.apache.jena.security.graph.SecuredGraph;
-import org.apache.jena.security.graph.SecuredGraphEventManager;
-import org.apache.jena.security.graph.SecuredPrefixMapping;
-import org.apache.jena.security.impl.ItemHolder;
-import org.apache.jena.security.impl.SecuredItem;
-import org.apache.jena.security.impl.SecuredItemImpl;
-import org.apache.jena.security.utils.PermTripleFilter;
+import com.hp.hpl.jena.graph.* ;
+import com.hp.hpl.jena.shared.AddDeniedException ;
+import com.hp.hpl.jena.shared.DeleteDeniedException ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
/**
* Implementation of SecuredGraph to be used by a SecuredItemInvoker proxy.
@@ -169,19 +160,28 @@ public class SecuredGraphImpl extends SecuredItemImpl implements SecuredGraph
return retval;
}
- @Override
- public ExtendedIterator<Triple> find( final TripleMatch m )
- {
- checkRead();
- ExtendedIterator<Triple> retval = holder.getBaseItem().find(m);
- if (!canRead(Triple.ANY))
- {
- retval = retval.filterKeep(new PermTripleFilter(Action.Read, this));
- }
- return retval;
- }
+ /** @deprecated Use/implement {@link #find(Triple)} */
+ @Deprecated
+ @Override
+ public ExtendedIterator<Triple> find( final TripleMatch m ) {
+ return find(Triple.createMatch(m.getMatchSubject(),
+ m.getMatchPredicate(),
+ m.getMatchObject())) ;
+ }
+
+ @Override
+ public ExtendedIterator<Triple> find( final Triple m )
+ {
+ checkRead();
+ ExtendedIterator<Triple> retval = holder.getBaseItem().find(m);
+ if (!canRead(Triple.ANY))
+ {
+ retval = retval.filterKeep(new PermTripleFilter(Action.Read, this));
+ }
+ return retval;
+ }
- @SuppressWarnings("deprecation")
+ @SuppressWarnings("deprecation")
@Override
public SecuredBulkUpdateHandler getBulkUpdateHandler()
{
[3/7] jena git commit: JENA-778 : Improve deprecated TripleMatch
handling.
Posted by an...@apache.org.
JENA-778 : Improve deprecated TripleMatch handling.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3d1336db
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3d1336db
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3d1336db
Branch: refs/heads/master
Commit: 3d1336db55a4b8cdee46a8549fa8174076480102
Parents: 9a05566
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jan 2 17:45:29 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jan 2 17:45:29 2015 +0000
----------------------------------------------------------------------
.../src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3d1336db/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
index 3515859..eaebd80 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
@@ -285,7 +285,12 @@ public abstract class GraphBase implements GraphWithPerform
*/
@Deprecated
protected ExtendedIterator<Triple> graphBaseFind( TripleMatch m ) {
- return graphBaseFind( (Triple)m ) ;
+ try {
+ return graphBaseFind( (Triple)m ) ;
+ } catch (ClassCastException ex) {
+ Triple t = Triple.createMatch(m.getMatchSubject(), m.getMatchPredicate(), m.getMatchObject()) ;
+ return graphBaseFind( t ) ;
+ }
}
protected abstract ExtendedIterator<Triple> graphBaseFind( Triple triplePattern );
[2/7] jena git commit: Remove explicit version for Guava
Posted by an...@apache.org.
Remove explicit version for Guava
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9a055668
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9a055668
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9a055668
Branch: refs/heads/master
Commit: 9a05566814fb196d1eb0f6b3a47618c545c08e82
Parents: 529ba41
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jan 2 17:10:05 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jan 2 17:10:05 2015 +0000
----------------------------------------------------------------------
jena-csv/pom.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9a055668/jena-csv/pom.xml
----------------------------------------------------------------------
diff --git a/jena-csv/pom.xml b/jena-csv/pom.xml
index ed49f31..12602b1 100644
--- a/jena-csv/pom.xml
+++ b/jena-csv/pom.xml
@@ -62,9 +62,8 @@
<!-- Google Code Guava -->
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>17.0</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<!-- Testing support -->
[7/7] jena git commit: JENA-841 : Timezone fix
Posted by an...@apache.org.
JENA-841 : Timezone fix
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f2efcb10
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f2efcb10
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f2efcb10
Branch: refs/heads/master
Commit: f2efcb10a4e9083238c3111df820c5ddea956582
Parents: ab563f8
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jan 2 18:45:31 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jan 2 18:45:31 2015 +0000
----------------------------------------------------------------------
.../statements/AbstractJenaStatementTests.java | 74 +++++++++++---------
1 file changed, 42 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f2efcb10/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/statements/AbstractJenaStatementTests.java
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/statements/AbstractJenaStatementTests.java b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/statements/AbstractJenaStatementTests.java
index 60ae306..a170847 100644
--- a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/statements/AbstractJenaStatementTests.java
+++ b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/statements/AbstractJenaStatementTests.java
@@ -18,38 +18,30 @@
package org.apache.jena.jdbc.statements;
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Types;
-import java.util.Calendar;
-
-import org.apache.jena.iri.IRIFactory;
-import org.apache.jena.jdbc.connections.JenaConnection;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.query.ParameterizedSparqlString;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.sparql.core.Quad;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
+import java.io.InputStream ;
+import java.io.Reader ;
+import java.math.BigDecimal ;
+import java.net.MalformedURLException ;
+import java.net.URI ;
+import java.net.URISyntaxException ;
+import java.net.URL ;
+import java.sql.* ;
+import java.util.Calendar ;
+import java.util.TimeZone ;
+
+import org.apache.jena.iri.IRIFactory ;
+import org.apache.jena.jdbc.connections.JenaConnection ;
+import org.junit.AfterClass ;
+import org.junit.Assert ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.query.ParameterizedSparqlString ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
/**
* Tests for statement, note many tests are included at a higher level in the
@@ -68,6 +60,24 @@ public abstract class AbstractJenaStatementTests {
*/
protected abstract JenaConnection getConnection() throws SQLException;
+ /* Java sort of gets 1 Jan 1970 wrong for Europe/London:
+ * http://stackoverflow.com/questions/1238172/why-does-an-hour-get-added-on-to-java-util-date-for-dates-before-nov-1-1971
+ * http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4832236
+ * This stabilizes the tests for everyone.
+ */
+
+ static TimeZone timezone = null ;
+ @BeforeClass public static void fixTimezone() {
+ timezone = TimeZone.getDefault() ;
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC")) ;
+ }
+
+ @AfterClass public static void resetTimezone() {
+ if ( timezone != null )
+ TimeZone.setDefault(timezone) ;
+ }
+
+
/**
* Test error case when trying to create statement with null connection
*
[6/7] jena git commit: JENA-836 : remove forced JDK setting of 1.6
Posted by an...@apache.org.
JENA-836 : remove forced JDK setting of 1.6
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ab563f8c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ab563f8c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ab563f8c
Branch: refs/heads/master
Commit: ab563f8c2854dc266ba02556d0bb09506c481e4f
Parents: 9fc0e4f
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jan 2 18:40:34 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jan 2 18:40:34 2015 +0000
----------------------------------------------------------------------
jena-jdbc/pom.xml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ab563f8c/jena-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/pom.xml b/jena-jdbc/pom.xml
index 967838f..cb48eb1 100644
--- a/jena-jdbc/pom.xml
+++ b/jena-jdbc/pom.xml
@@ -70,14 +70,8 @@
<plugins>
<!-- Compiler Plugin -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>UTF-8</encoding>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
</plugin>
<!-- License Plugin -->
<plugin>
@@ -130,7 +124,7 @@
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.4</version>
<configuration>
- <source>1.6</source>
+ <source>1.7</source>
</configuration>
<executions>
<execution>