Skip to content

Commit fda4e47

Browse files
author
Miel Vander Sande
committed
Upgrade to jena3
1 parent ac7c78c commit fda4e47

File tree

11 files changed

+62
-64
lines changed

11 files changed

+62
-64
lines changed

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,15 @@
1010
<jettyVersion>9.3.6.v20151106</jettyVersion>
1111
</properties>
1212
<dependencies>
13-
<dependency>
14-
<groupId>org.rdfhdt</groupId>
15-
<artifactId>hdt-jena</artifactId>
16-
<version>1.1</version>
17-
</dependency>
1813
<dependency>
1914
<groupId>org.apache.jena</groupId>
2015
<artifactId>jena-core</artifactId>
21-
<version>2.13.0</version>
16+
<version>3.0.0</version>
2217
</dependency>
2318
<dependency>
2419
<groupId>org.apache.jena</groupId>
2520
<artifactId>jena-arq</artifactId>
26-
<version>2.13.0</version>
21+
<version>3.0.0</version>
2722
</dependency>
2823
<dependency>
2924
<groupId>org.apache.httpcomponents</groupId>
@@ -71,7 +66,12 @@
7166
<dependency>
7267
<groupId>org.apache.jena</groupId>
7368
<artifactId>jena-tdb</artifactId>
74-
<version>1.1.2</version>
69+
<version>3.0.0</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.rdfhdt</groupId>
73+
<artifactId>hdt-jena</artifactId>
74+
<version>1.1.1-SNAPSHOT</version>
7575
</dependency>
7676
</dependencies>
7777
<build>

‎src/org/linkeddatafragments/datasource/HdtDataSource.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import org.rdfhdt.hdt.triples.TripleID;
1010
import org.rdfhdt.hdtjena.NodeDictionary;
1111

12-
import com.hp.hpl.jena.graph.Triple;
13-
import com.hp.hpl.jena.rdf.model.Model;
14-
import com.hp.hpl.jena.rdf.model.ModelFactory;
15-
import com.hp.hpl.jena.rdf.model.Property;
16-
import com.hp.hpl.jena.rdf.model.RDFNode;
17-
import com.hp.hpl.jena.rdf.model.Resource;
12+
import org.apache.jena.graph.Triple;
13+
import org.apache.jena.rdf.model.Model;
14+
import org.apache.jena.rdf.model.ModelFactory;
15+
import org.apache.jena.rdf.model.Property;
16+
import org.apache.jena.rdf.model.RDFNode;
17+
import org.apache.jena.rdf.model.Resource;
1818

1919
/**
2020
* An HDT data source of Basic Linked Data Fragments.

‎src/org/linkeddatafragments/datasource/IDataSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.linkeddatafragments.datasource;
22

3-
import com.hp.hpl.jena.rdf.model.Property;
4-
import com.hp.hpl.jena.rdf.model.RDFNode;
5-
import com.hp.hpl.jena.rdf.model.Resource;
3+
import org.apache.jena.rdf.model.Property;
4+
import org.apache.jena.rdf.model.RDFNode;
5+
import org.apache.jena.rdf.model.Resource;
66

77
/**
88
* A data source of Basic Linked Data Fragments.

‎src/org/linkeddatafragments/datasource/IndexDataSource.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.linkeddatafragments.datasource;
22

3-
import com.hp.hpl.jena.rdf.model.Model;
4-
import com.hp.hpl.jena.rdf.model.ModelFactory;
5-
import com.hp.hpl.jena.rdf.model.Property;
6-
import com.hp.hpl.jena.rdf.model.RDFNode;
7-
import com.hp.hpl.jena.rdf.model.Resource;
8-
import com.hp.hpl.jena.rdf.model.StmtIterator;
9-
import com.hp.hpl.jena.rdf.model.impl.PropertyImpl;
10-
import com.hp.hpl.jena.rdf.model.impl.ResourceImpl;
3+
import org.apache.jena.rdf.model.Model;
4+
import org.apache.jena.rdf.model.ModelFactory;
5+
import org.apache.jena.rdf.model.Property;
6+
import org.apache.jena.rdf.model.RDFNode;
7+
import org.apache.jena.rdf.model.Resource;
8+
import org.apache.jena.rdf.model.StmtIterator;
9+
import org.apache.jena.rdf.model.impl.PropertyImpl;
10+
import org.apache.jena.rdf.model.impl.ResourceImpl;
1111
import java.util.HashMap;
1212
import java.util.Map;
1313

‎src/org/linkeddatafragments/datasource/JenaTDBDataSource.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package org.linkeddatafragments.datasource;
22

3-
import com.hp.hpl.jena.query.Dataset;
4-
import com.hp.hpl.jena.query.Query;
5-
import com.hp.hpl.jena.query.QueryExecution;
6-
import com.hp.hpl.jena.query.QueryExecutionFactory;
7-
import com.hp.hpl.jena.query.QueryFactory;
8-
import com.hp.hpl.jena.query.QuerySolution;
9-
import com.hp.hpl.jena.query.QuerySolutionMap;
10-
import com.hp.hpl.jena.query.ResultSet;
11-
import com.hp.hpl.jena.query.Syntax;
12-
import com.hp.hpl.jena.rdf.model.Literal;
13-
import com.hp.hpl.jena.rdf.model.Model;
14-
import com.hp.hpl.jena.rdf.model.ModelFactory;
15-
import com.hp.hpl.jena.rdf.model.Property;
16-
import com.hp.hpl.jena.rdf.model.RDFNode;
17-
import com.hp.hpl.jena.rdf.model.Resource;
18-
import com.hp.hpl.jena.tdb.TDBFactory;
3+
import org.apache.jena.query.Dataset;
4+
import org.apache.jena.query.Query;
5+
import org.apache.jena.query.QueryExecution;
6+
import org.apache.jena.query.QueryExecutionFactory;
7+
import org.apache.jena.query.QueryFactory;
8+
import org.apache.jena.query.QuerySolution;
9+
import org.apache.jena.query.QuerySolutionMap;
10+
import org.apache.jena.query.ResultSet;
11+
import org.apache.jena.query.Syntax;
12+
import org.apache.jena.rdf.model.Literal;
13+
import org.apache.jena.rdf.model.Model;
14+
import org.apache.jena.rdf.model.ModelFactory;
15+
import org.apache.jena.rdf.model.Property;
16+
import org.apache.jena.rdf.model.RDFNode;
17+
import org.apache.jena.rdf.model.Resource;
18+
import org.apache.jena.tdb.TDBFactory;
1919
import java.io.File;
2020

2121
/**

‎src/org/linkeddatafragments/datasource/TriplePatternFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.linkeddatafragments.datasource;
22

3-
import com.hp.hpl.jena.rdf.model.Model;
3+
import org.apache.jena.rdf.model.Model;
44

55
/**
66
* A Triple Pattern Fragment.

‎src/org/linkeddatafragments/datasource/TriplePatternFragmentBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.linkeddatafragments.datasource;
22

3-
import com.hp.hpl.jena.rdf.model.Model;
4-
import com.hp.hpl.jena.rdf.model.ModelFactory;
3+
import org.apache.jena.rdf.model.Model;
4+
import org.apache.jena.rdf.model.ModelFactory;
55

66
/**
77
* Base implementation of a Basic Linked Data Fragment.

‎src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.linkeddatafragments.servlet;
22

33
import com.google.gson.JsonObject;
4-
import com.hp.hpl.jena.datatypes.TypeMapper;
5-
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
6-
import com.hp.hpl.jena.rdf.model.Literal;
7-
import com.hp.hpl.jena.rdf.model.Model;
8-
import com.hp.hpl.jena.rdf.model.Property;
9-
import com.hp.hpl.jena.rdf.model.RDFNode;
10-
import com.hp.hpl.jena.rdf.model.Resource;
11-
import com.hp.hpl.jena.rdf.model.ResourceFactory;
12-
import com.hp.hpl.jena.shared.InvalidPropertyURIException;
4+
import org.apache.jena.datatypes.TypeMapper;
5+
import org.apache.jena.datatypes.xsd.XSDDatatype;
6+
import org.apache.jena.rdf.model.Literal;
7+
import org.apache.jena.rdf.model.Model;
8+
import org.apache.jena.rdf.model.Property;
9+
import org.apache.jena.rdf.model.RDFNode;
10+
import org.apache.jena.rdf.model.Resource;
11+
import org.apache.jena.rdf.model.ResourceFactory;
12+
import org.apache.jena.shared.InvalidPropertyURIException;
1313
import java.io.File;
1414
import java.io.FileReader;
1515
import java.io.IOException;
@@ -18,8 +18,6 @@
1818
import java.util.Collection;
1919
import java.util.HashMap;
2020
import java.util.Map.Entry;
21-
import java.util.logging.Level;
22-
import java.util.logging.Logger;
2321
import java.util.regex.Matcher;
2422
import java.util.regex.Pattern;
2523
import javax.servlet.ServletConfig;

‎src/org/linkeddatafragments/util/CommonResources.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.linkeddatafragments.util;
22

3-
import com.hp.hpl.jena.rdf.model.Property;
4-
import com.hp.hpl.jena.rdf.model.ResourceFactory;
3+
import org.apache.jena.rdf.model.Property;
4+
import org.apache.jena.rdf.model.ResourceFactory;
55

66
@SuppressWarnings("javadoc")
77
public class CommonResources {

‎src/test/java/org/linkeddatafragments/datasource/DataSourceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package test.java.org.linkeddatafragments.datasource;
22

33
import com.google.gson.JsonObject;
4-
import com.hp.hpl.jena.rdf.model.Model;
5-
import com.hp.hpl.jena.rdf.model.ModelFactory;
6-
import com.hp.hpl.jena.rdf.model.Property;
7-
import com.hp.hpl.jena.rdf.model.Resource;
4+
import org.apache.jena.rdf.model.Model;
5+
import org.apache.jena.rdf.model.ModelFactory;
6+
import org.apache.jena.rdf.model.Property;
7+
import org.apache.jena.rdf.model.Resource;
88

99
import java.io.File;
1010
import java.io.IOException;

0 commit comments

Comments
 (0)