Add the OSGi bundle for Lyo Core (#16)

- Added Lyo-Validation and Store Core packages.
- Changes jena-libs dependency and removed lyo.validation from
oslc4j-bundle.

Signed-off-by: Yash Khatri <yash.khatri@scania.com>
Signed-off-by: Andrew Berezovskyi <andriib@kth.se>

org.eclipse.lyo.oslc4j.build/pom.xml

@@ -1,6 +1,5 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.lyo.oslc4j.core</groupId>
   <artifactId>oslc4j-core-build</artifactId>
@@ -42,6 +41,7 @@
     <module>../org.eclipse.lyo.oslc4j.registry</module>
     <module>../org.eclipse.lyo.repackaging.jersey</module>
     <module>../org.eclipse.lyo.shacl</module>
+    <module>../oslc4j-bundle</module>
   </modules>
 
   <dependencyManagement>
@@ -178,4 +178,4 @@
       <url>https://repo.eclipse.org/content/repositories/lyo-snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
-</project>
+</project>

org.eclipse.lyo.oslc4j.core/pom.xml

@@ -37,9 +37,19 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
-            <artifactId>apache-jena-libs</artifactId>
-            <type>pom</type>
+            <artifactId>jena-tdb</artifactId>
+            <version>3.6.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-tdb2</artifactId>
+             <version>3.6.0</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-rdfconnection</artifactId>
+            <version>3.6.0</version>
+         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -117,6 +127,77 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.4.3</version>
             </plugin>
+
+            <!-- <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.3.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <_exportcontents>
+                            org.apache.jena.rdf.model,
+                            org.apache.jena.shared,
+                            org.apache.jena.util,
+                            org.apache.jena.vocabulary,
+                            org.apache.commons.codec.binary,
+                            org.apache.http;version="4.1.0",
+                            org.apache.http.client;version="4.1.0",
+                            org.apache.http.client.methods;version="4.1.0",
+                            org.apache.http.conn;version="4.1.0",
+                            org.apache.http.conn.scheme;version="4.1.0",
+                            org.apache.http.conn.ssl;version="4.1.0",
+                            org.apache.http.entity;version="4.1.0",
+                            org.apache.http.impl.client;version="4.1.0",
+                            org.apache.http.message;version="4.1.0",
+                            org.apache.http.util;version="4.1.0",
+                            org.apache.wink.client,
+                            org.apache.wink.json4j;version="1.4.0",
+                            org.eclipse.lyo.client.exception,
+                            org.eclipse.lyo.client.oslc,
+                            org.eclipse.lyo.client.oslc.jazz,
+                            org.eclipse.lyo.client.oslc.resources,
+                            org.eclipse.lyo.core.query,
+                            org.eclipse.lyo.core.query.impl,
+                            org.eclipse.lyo.core.trs,
+                            org.eclipse.lyo.core.utils.marshallers,
+                            org.eclipse.lyo.oslc4j.application,
+                            org.eclipse.lyo.oslc4j.client,
+                            org.eclipse.lyo.oslc4j.core,
+                            org.eclipse.lyo.oslc4j.core.annotation,
+                            org.eclipse.lyo.oslc4j.core.exception,
+                            org.eclipse.lyo.oslc4j.core.model,
+                            org.eclipse.lyo.oslc4j.provider.jena,
+                            org.eclipse.lyo.oslc4j.provider.json4j,
+                            org.eclipse.lyo.oslc4j.utils
+                        </_exportcontents>
+                        <Import-Package>
+                            javax.servlet;version="2.5.0",
+                            javax.servlet.http;version="2.5.0",
+                            javax.ws.rs;version="1.1.1",
+                            javax.ws.rs.core;version="1.1.1",
+                            javax.ws.rs.ext;version="1.1.1"
+                        </Import-Package>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+                        <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
+                        <Embed-Directory>dependencies</Embed-Directory>
+                        <Embed-StripGroup>true</Embed-StripGroup>
+                        <Embed-Transitive>true</Embed-Transitive>
+                    </instructions>
+                    <finalName>${project.groupId}.${project.artifactId}_${project.version}</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>osgi-bundle</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin> -->
         </plugins>
     </build>
     <distributionManagement>

org.eclipse.lyo.oslc4j.provider.jena/pom.xml

@@ -47,9 +47,19 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
-            <artifactId>apache-jena-libs</artifactId>
-            <type>pom</type>
+            <artifactId>jena-tdb</artifactId>
+            <version>3.6.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-tdb2</artifactId>
+             <version>3.6.0</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-rdfconnection</artifactId>
+            <version>3.6.0</version>
+         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

oslc4j-bundle/META-INF/MANIFEST.MF

@@ -0,0 +1,83 @@
+Manifest-Version: 1.0
+Bnd-LastModified: 1530711795736
+Build-Jdk: 1.8.0_144
+Built-By: ykhaet
+Bundle-ManifestVersion: 2
+Bundle-Name: oslc4j-bundle
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: oslc4j-bundle
+Bundle-Version: 2.4.0.SNAPSHOT
+Created-By: Apache Maven Bundle Plugin
+Embed-Dependency: *;scope=compile|runtime;inline=true
+Embed-Directory: dependencies
+Embed-StripGroup: true
+Embed-Transitive: true
+Export-Package: org.eclipse.lyo.shacl;uses:="org.eclipse.lyo.oslc4j.core
+ .annotation,org.eclipse.lyo.oslc4j.core.exception,org.eclipse.lyo.oslc4
+ j.core.model";version="2.4.0.SNAPSHOT",org.eclipse.lyo.shacl.annotation
+ s;uses:="org.eclipse.lyo.oslc4j.core.model";version="2.4.0.SNAPSHOT",or
+ g.apache.jena.rdf.model;uses:="org.apache.jena.graph,org.apache.jena.sh
+ ared";version="2.4.0.SNAPSHOT",org.apache.jena.shared;uses:="org.apache
+ .jena.graph,org.apache.jena.rdf.model";version="2.4.0.SNAPSHOT",org.apa
+ che.jena.util;uses:="org.apache.jena.graph,org.apache.jena.rdf.model,or
+ g.apache.jena.shared";version="2.4.0.SNAPSHOT",org.apache.jena.graph;us
+ es:="org.apache.jena.shared";version="2.4.0.SNAPSHOT",org.apache.jena.v
+ ocabulary;uses:="org.apache.jena.graph,org.apache.jena.rdf.model";versi
+ on="2.4.0.SNAPSHOT",org.apache.jena.query;uses:="org.apache.http.client
+ ,org.apache.jena.graph,org.apache.jena.rdf.model,org.apache.jena.shared
+ ,org.apache.jena.update,org.apache.jena.util";version="2.4.0.SNAPSHOT",
+ org.apache.jena.riot;uses:="org.apache.http.client,org.apache.jena.grap
+ h,org.apache.jena.query,org.apache.jena.rdf.model,org.apache.jena.share
+ d";version="2.4.0.SNAPSHOT",org.apache.commons.codec.binary;version="1.
+ 9",org.apache.jena.update;uses:="org.apache.http.client,org.apache.jena
+ .graph,org.apache.jena.query,org.apache.jena.rdf.model,org.apache.jena.
+ shared";version="2.4.0.SNAPSHOT",org.apache.http;version="4.1.0";uses:=
+ "org.apache.http.util",org.apache.http.client;version="4.1.0";uses:="or
+ g.apache.http,org.apache.http.client.methods,org.apache.http.conn",org.
+ apache.http.client.methods;version="4.1.0";uses:="org.apache.http,org.a
+ pache.http.conn,org.apache.http.message",org.apache.http.conn;version="
+ 4.1.0";uses:="org.apache.http,org.apache.http.conn.scheme,org.apache.ht
+ tp.entity",org.apache.http.conn.scheme;version="4.1.0";uses:="org.apach
+ e.http,org.apache.http.conn",org.apache.http.conn.ssl;version="4.1.0";u
+ ses:="org.apache.http,org.apache.http.conn,org.apache.http.conn.scheme"
+ ,org.apache.http.entity;version="4.1.0";uses:="org.apache.http",org.apa
+ che.http.impl.client;version="4.1.0";uses:="org.apache.http,org.apache.
+ http.client,org.apache.http.client.methods,org.apache.http.conn,org.apa
+ che.http.conn.ssl,org.apache.http.message",org.apache.http.message;vers
+ ion="4.1.0";uses:="org.apache.http,org.apache.http.util",org.apache.htt
+ p.util;version="4.1.0";uses:="org.apache.http",org.eclipse.lyo.oslc4j.c
+ ore;uses:="javax.servlet.http,org.apache.jena.rdf.model,org.eclipse.lyo
+ .oslc4j.core.model";version="2.4.0.SNAPSHOT",org.eclipse.lyo.oslc4j.cor
+ e.annotation;uses:="org.eclipse.lyo.oslc4j.core.model";version="2.4.0.S
+ NAPSHOT",org.eclipse.lyo.oslc4j.core.exception;uses:="org.eclipse.lyo.o
+ slc4j.core.annotation,org.eclipse.lyo.oslc4j.core.model";version="2.4.0
+ .SNAPSHOT",org.eclipse.lyo.oslc4j.core.model;uses:="javax.ws.rs,javax.w
+ s.rs.core,org.eclipse.lyo.oslc4j.core.annotation,org.eclipse.lyo.oslc4j
+ .core.exception";version="2.4.0.SNAPSHOT",org.eclipse.lyo.oslc4j.provid
+ er.jena;uses:="javax.servlet.http,javax.ws.rs,javax.ws.rs.core,javax.ws
+ .rs.ext,org.apache.jena.graph,org.apache.jena.rdf.model,org.eclipse.lyo
+ .oslc4j.core.exception,org.eclipse.lyo.oslc4j.core.model";version="2.4.
+ 0.SNAPSHOT",org.eclipse.lyo.store;uses:="org.apache.jena.rdf.model,org.
+ eclipse.lyo.oslc4j.core.model";version="2.4.0.SNAPSHOT",org.eclipse.lyo
+ .store.internals;uses:="org.apache.jena.query,org.apache.jena.rdf.model
+ ,org.eclipse.lyo.oslc4j.core.model,org.eclipse.lyo.store,org.eclipse.ly
+ o.store.internals.query";version="2.4.0.SNAPSHOT",org.eclipse.lyo.store
+ .internals.query;uses:="org.apache.jena.query,org.apache.jena.update";v
+ ersion="2.4.0.SNAPSHOT",org.apache.jena.atlas.web.auth;version="2.4.0.S
+ NAPSHOT",org.apache.jena.riot.Lang;version="2.4.0.SNAPSHOT",org.apache.
+ wink.client;version="2.4.0.SNAPSHOT",org.apache.wink.json4j;version="1.
+ 4.0",org.eclipse.lyo.client.exception;version="2.4.0.SNAPSHOT",org.ecli
+ pse.lyo.client.oslc;version="2.4.0.SNAPSHOT",org.eclipse.lyo.client.osl
+ c.jazz;version="2.4.0.SNAPSHOT",org.eclipse.lyo.client.oslc.resources;v
+ ersion="2.4.0.SNAPSHOT",org.eclipse.lyo.core.query;version="2.4.0.SNAPS
+ HOT",org.eclipse.lyo.core.query.impl;version="2.4.0.SNAPSHOT",org.eclip
+ se.lyo.core.trs;version="2.4.0.SNAPSHOT",org.eclipse.lyo.core.utils.mar
+ shallers;version="2.4.0.SNAPSHOT",org.eclipse.lyo.oslc4j.application;ve
+ rsion="2.4.0.SNAPSHOT",org.eclipse.lyo.oslc4j.client;version="2.4.0.SNA
+ PSHOT",org.eclipse.lyo.oslc4j.provider.json4j;version="2.4.0.SNAPSHOT",
+ org.eclipse.lyo.oslc4j.utils;version="2.4.0.SNAPSHOT"
+Import-Package: javax.servlet;version="2.5.0",javax.servlet.http;version
+ ="2.5.0",javax.ws.rs;version="1.1.1",javax.ws.rs.core;version="1.1.1",j
+ avax.ws.rs.ext;version="1.1.1"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+Tool: Bnd-3.5.0.201709291849

oslc4j-bundle/osgi.bnd

@@ -0,0 +1,5 @@
+#-----------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the bundle
+#-----------------------------------------------------------------
+
+#Bundle-Activator: ${bundle.namespace}.internal.Activator