Added Jena-Libs dependency back to the POMs.

Change-Id: If7cd297947a6edaff44e05bb5434684a88d08279 Signed-off-by: Yash Khatri <yash.khatri@scania.com>
eclipse · Jul 12, 2018 · fb33561 · fb33561
1 parent 1eb6379
commit fb33561
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 33 deletions.
diff --git a/org.eclipse.lyo.oslc4j.core/pom.xml b/org.eclipse.lyo.oslc4j.core/pom.xml
@@ -37,18 +37,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
-            <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>
+            <artifactId>apache-jena-libs</artifactId>
+            <type>pom</type>
          </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/org.eclipse.lyo.oslc4j.provider.jena/pom.xml b/org.eclipse.lyo.oslc4j.provider.jena/pom.xml
@@ -47,18 +47,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
-            <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>
+            <artifactId>apache-jena-libs</artifactId>
+            <type>pom</type>
          </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/oslc4j-bundle/META-INF/MANIFEST.MF b/oslc4j-bundle/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1531331936854
-Build-Jdk: 1.8.0_152
-Built-By: andrew
+Bnd-LastModified: 1531399521310
+Build-Jdk: 1.8.0_144
+Built-By: Yash Khatri
 Bundle-ManifestVersion: 2
 Bundle-Name: oslc4j-bundle
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/oslc4j-bundle/pom.xml b/oslc4j-bundle/pom.xml
@@ -35,16 +35,16 @@
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
-	<dependency>
-    <groupId>org.eclipse.lyo</groupId>
-    <artifactId>shacl</artifactId>
-    <version>2.4.0-SNAPSHOT</version>
-	</dependency>
-
     <dependency>
       <groupId>org.eclipse.lyo.oslc4j.core</groupId>
       <artifactId>oslc4j-core</artifactId>
       <version>2.4.0-SNAPSHOT</version>
+      <exclusions>
+          <exclusion>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>apache-jena-libs</artifactId>
+          </exclusion>
+       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.lyo</groupId>
@@ -60,6 +60,10 @@
       		<groupId>xml-apis</groupId>
       		<artifactId>xml-apis</artifactId>
       	</exclusion>
+      	<exclusion>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>apache-jena-libs</artifactId>
+         </exclusion>
       </exclusions>
     </dependency>