ontapi-osgi: handle ont-api jena model changes (see owlcs/ont-api#4, owlcs/ont-api#8)

Author: sszuev

src/test/java/org/github/owlcs/ontapi/tests/func/FunctionalTest.java

@@ -2,7 +2,7 @@
 
 import com.github.owlcs.ontapi.*;
 import com.github.owlcs.ontapi.jena.OntModelFactory;
-import com.github.owlcs.ontapi.jena.model.OntGraphModel;
+import com.github.owlcs.ontapi.jena.model.OntModel;
 import com.github.owlcs.ontapi.jena.model.OntStatement;
 import com.github.owlcs.ontapi.jena.utils.Graphs;
 import com.github.owlcs.ontapi.jena.vocabulary.OWL;
@@ -41,7 +41,7 @@ public static void before() {
     @Test
     public void testGeneralFunctionality() throws Exception {
         String uri = "http://test";
-        OntGraphModel g = OntModelFactory.createModel();
+        OntModel g = OntModelFactory.createModel();
         g.setID(uri);
         StringWriter sw = new StringWriter();
         g.write(sw, OntFormat.TURTLE.getID());
@@ -103,7 +103,6 @@ public void testJenaFormatsCompileScope() throws Exception {
         }
     }
 
-
     @Test
     public void testFactoriesTestScope() {
         String loadFactory = "com.github.owlcs.ontapi.OntologyFactoryImpl";
@@ -155,7 +154,8 @@ public void testOWLFormatsTestScope() throws Exception {
             OWLStorer storer = factory.createStorer();
             OWLDocumentFormat format = lang.getFormatFactory().get();
             ByteArrayOutputStream out = new ByteArrayOutputStream();
-            logger.info("FORMAT: {{}-{}:'{}'}", factory.getClass().getSimpleName(), format.getClass().getSimpleName(), format.getKey());
+            logger.info("FORMAT: {{}-{}:'{}'}",
+                    factory.getClass().getSimpleName(), format.getClass().getSimpleName(), format.getKey());
             storer.storeOntology(o, new StreamDocumentTarget(out), format);
             logger.debug("{}", new String(out.toByteArray(), StandardCharsets.UTF_8));
         }

src/test/java/org/github/owlcs/ontapi/tests/osgi/BundlesCoreITTest.java

@@ -36,7 +36,7 @@ public static List<Tester<?>> getTesters() {
                 , Tester.of(Ontology.class)
                 , Tester.of(OWLOntologyManager.class)
                 , Tester.of(Graph.class)
-                , Tester.of(com.github.owlcs.ontapi.jena.model.OntCE.UnaryRestrictionCE.class)
+                , Tester.of(com.github.owlcs.ontapi.jena.model.OntClass.UnaryRestrictionCE.class)
                 , Tester.of(com.github.owlcs.ontapi.transforms.SWRLTransform.class)
                 , Tester.of(com.github.owlcs.ontapi.internal.ONTObject.class)
                 , Tester.of(IRI.class, ClassesITTest::testIRI)