aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.lyo.client.java.sample/pom.xml4
-rw-r--r--org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/DoorsOauthSample.java26
-rw-r--r--org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/automation/AutomationAdapter.java8
-rw-r--r--org.eclipse.lyo.client.java/pom.xml8
-rw-r--r--org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/jazz/JazzRootServicesHelper.java10
-rw-r--r--org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/OslcQueryResult.java22
-rw-r--r--org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/RmConstants.java2
7 files changed, 40 insertions, 40 deletions
diff --git a/org.eclipse.lyo.client.java.sample/pom.xml b/org.eclipse.lyo.client.java.sample/pom.xml
index e8f704d..8fc4683 100644
--- a/org.eclipse.lyo.client.java.sample/pom.xml
+++ b/org.eclipse.lyo.client.java.sample/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.lyo.samples.clients</groupId>
<artifactId>oslc-java-samples</artifactId>
- <version>2.2.0</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>org.eclipse.lyo.samples.clients</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -11,7 +11,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<wink.version>1.4</wink.version>
- <lyo.version>2.2.0</lyo.version>
+ <lyo.version>2.3.0-SNAPSHOT</lyo.version>
</properties>
<dependencies>
diff --git a/org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/DoorsOauthSample.java b/org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/DoorsOauthSample.java
index c0247e3..3638a49 100644
--- a/org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/DoorsOauthSample.java
+++ b/org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/DoorsOauthSample.java
@@ -70,17 +70,17 @@ import org.eclipse.lyo.oslc4j.core.model.ServiceProvider;
import org.eclipse.lyo.oslc4j.provider.jena.AbstractOslcRdfXmlProvider;
import org.w3c.dom.Element;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.ResIterator;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Selector;
-import com.hp.hpl.jena.rdf.model.SimpleSelector;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.vocabulary.RDF;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.ResIterator;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Selector;
+import org.apache.jena.rdf.model.SimpleSelector;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.vocabulary.RDF;
/**
* Samples of logging in to Doors Web Access and running OSLC operations
@@ -502,7 +502,7 @@ public class DoorsOauthSample {
//check each serviceProvider's title and match it to the one passed in
while (listStatements.hasNext()) {
Statement thisSP = listStatements.nextStatement();
- com.hp.hpl.jena.rdf.model.Resource spRes = thisSP.getResource();
+ org.apache.jena.rdf.model.Resource spRes = thisSP.getResource();
if ( spRes.isResource()) {
// Recursively look for the project Name
String newURL = spRes.getURI();
@@ -525,7 +525,7 @@ public class DoorsOauthSample {
//check each serviceProvider's title and match it to the one passed in
while (listStatements.hasNext()) {
Statement thisSP = listStatements.nextStatement();
- com.hp.hpl.jena.rdf.model.Resource spRes = thisSP.getResource();
+ org.apache.jena.rdf.model.Resource spRes = thisSP.getResource();
if ( spRes.isResource()) {
// Recursively look for the project Name
String newURL = spRes.getURI();
diff --git a/org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/automation/AutomationAdapter.java b/org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/automation/AutomationAdapter.java
index 079d413..8aaa2aa 100644
--- a/org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/automation/AutomationAdapter.java
+++ b/org.eclipse.lyo.client.java.sample/src/main/java/org/eclipse/lyo/client/oslc/samples/automation/AutomationAdapter.java
@@ -73,10 +73,10 @@ import org.eclipse.lyo.oslc4j.core.model.ValueType;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.vocabulary.RDF;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.vocabulary.RDF;
@OslcResourceShape(title = "Automation Adapter Resource Shape", describes = IConstants.TYPE_AUTOMATION_ADAPTER)
@OslcNamespace(IConstants.NAMESPACE_URI_JAZZ_AUTO_RQM)
diff --git a/org.eclipse.lyo.client.java/pom.xml b/org.eclipse.lyo.client.java/pom.xml
index 4dff0e5..ee31680 100644
--- a/org.eclipse.lyo.client.java/pom.xml
+++ b/org.eclipse.lyo.client.java/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.lyo.clients</groupId>
<artifactId>oslc-java-client</artifactId>
- <version>2.2.0</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>OSLC Java Client</name>
<description>Eclipse Lyo OSLC Java client based on OSLC4J and Apache Wink.</description>
<scm>
@@ -15,7 +15,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<wink.version>1.4</wink.version>
- <lyo.version>2.2.0</lyo.version>
+ <lyo.version>2.3.0-SNAPSHOT</lyo.version>
</properties>
<!-- Disable doclint for Java 1.8 (for now) -->
<profiles>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.13.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -232,7 +232,7 @@
<!-- CQ 13902 -->
<groupId>org.apache.jena</groupId>
<artifactId>jena-iri</artifactId>
- <version>1.1.2</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
diff --git a/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/jazz/JazzRootServicesHelper.java b/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/jazz/JazzRootServicesHelper.java
index 1d05268..f2d3b83 100644
--- a/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/jazz/JazzRootServicesHelper.java
+++ b/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/jazz/JazzRootServicesHelper.java
@@ -30,11 +30,11 @@ import org.eclipse.lyo.client.oslc.OSLCConstants;
import org.eclipse.lyo.client.oslc.OslcClient;
import org.eclipse.lyo.client.oslc.OslcOAuthClient;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
/**
* Helper class to assist in retrieval of attributes from the IBM Rational
diff --git a/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/OslcQueryResult.java b/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/OslcQueryResult.java
index 478cfe9..9019398 100644
--- a/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/OslcQueryResult.java
+++ b/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/OslcQueryResult.java
@@ -32,17 +32,17 @@ import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.ResIterator;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Selector;
-import com.hp.hpl.jena.rdf.model.SimpleSelector;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.vocabulary.RDFS;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.ResIterator;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Selector;
+import org.apache.jena.rdf.model.SimpleSelector;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.vocabulary.RDFS;
/**
diff --git a/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/RmConstants.java b/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/RmConstants.java
index 805008f..07de9f2 100644
--- a/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/RmConstants.java
+++ b/org.eclipse.lyo.client.java/src/main/java/org/eclipse/lyo/client/oslc/resources/RmConstants.java
@@ -20,7 +20,7 @@ import javax.xml.namespace.QName;
import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
-import com.hp.hpl.jena.datatypes.BaseDatatype;
+import org.apache.jena.datatypes.BaseDatatype;
public interface RmConstants
{