Merge jena-project POM into root POM

novellll · Nov 18, 2017 · 6820b35 · 6820b35
1 parent b17efa1
commit 6820b35
Show file tree

Hide file tree

Showing 31 changed files with 812 additions and 1,182 deletions.
diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
@@ -19,9 +19,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <!-- Need if the parent is a snapshot -->

diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.4.0-SNAPSHOT</version>
   </parent>
 

diff --git a/apache-jena-osgi/pom.xml b/apache-jena-osgi/pom.xml
@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent> 
 
   <name>Apache Jena - OSGi</name>

diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
@@ -36,9 +36,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <organization>

diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
@@ -25,9 +25,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <!-- Need if the parent is a snapshot -->

diff --git a/jena-base/pom.xml b/jena-base/pom.xml
@@ -21,9 +21,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <artifactId>jena-base</artifactId>
   <version>3.6.0-SNAPSHOT</version>

diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent> 
 
   <name>Apache Jena - Command line tools</name>

diff --git a/jena-core/pom.xml b/jena-core/pom.xml
@@ -26,9 +26,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <description>Jena is a Java framework for building Semantic Web applications. It provides a programmatic environment for RDF, RDFS and OWL, SPARQL and includes a rule-based inference engine.</description>

diff --git a/jena-csv/pom.xml b/jena-csv/pom.xml
@@ -25,9 +25,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
 

diff --git a/jena-db/pom.xml b/jena-db/pom.xml
@@ -28,9 +28,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <licenses>

diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml
@@ -22,9 +22,9 @@ limitations under the License.
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <name>Apache Jena - Elephas</name>

diff --git a/jena-extras/pom.xml b/jena-extras/pom.xml
@@ -28,9 +28,9 @@ limitations under the License.
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <!-- Need if the parent is a snapshot -->

diff --git a/jena-fuseki1/pom.xml b/jena-fuseki1/pom.xml
@@ -27,9 +27,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent> 
 
   <!-- Need if the parent is a snapshot -->

diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent> 
 
   <name>Apache Jena - Fuseki - A SPARQL 1.1 Server</name>

diff --git a/jena-integration-tests/pom.xml b/jena-integration-tests/pom.xml
@@ -31,9 +31,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <licenses>

diff --git a/jena-iri/pom.xml b/jena-iri/pom.xml
@@ -26,9 +26,9 @@
   <version>3.6.0-SNAPSHOT</version>
     <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent> 
 
   <description>

diff --git a/jena-jdbc/pom.xml b/jena-jdbc/pom.xml
@@ -28,9 +28,9 @@
 
 	<parent>
 		<groupId>org.apache.jena</groupId>
-		<artifactId>jena-project</artifactId>
+		<artifactId>jena</artifactId>
 		<version>3.6.0-SNAPSHOT</version>
-		<relativePath>../jena-project</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 
 	<!-- Need if the parent is a snapshot -->

diff --git a/jena-maven-tools/pom.xml b/jena-maven-tools/pom.xml
@@ -29,9 +29,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <developers>

diff --git a/jena-permissions/pom.xml b/jena-permissions/pom.xml
@@ -33,9 +33,9 @@
 
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-project</artifactId>
+    <artifactId>jena</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../jena-project</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 	<organization>
 		 <name>The Apache Software Foundation</name>

diff --git a/jena-project/DEPENDENCIES b/jena-project/DEPENDENCIES