From d70e7dbcff6e304724caaf644f1f0f5394ff6998 Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Tue, 3 Feb 2015 11:59:38 +0000
Subject: [PATCH 1/2] jena-osgi,jena-osgi-test under apache-jena-osgi

---
 .../jena-osgi-test}/pom.xml                   |  0
 .../apache/jena/osgi/test/JenaOSGITest.java   |  0
 .../jena/osgi/test/JenaOSGITestActivator.java |  0
 .../jena/osgi/test/JenaOSGITestImpl.java      |  0
 .../jena-osgi}/pom.xml                        |  0
 apache-jena-osgi/pom.xml                      | 51 +++++++++++++++++++
 pom.xml                                       |  4 +-
 7 files changed, 52 insertions(+), 3 deletions(-)
 rename {jena-osgi-test => apache-jena-osgi/jena-osgi-test}/pom.xml (100%)
 rename {jena-osgi-test => apache-jena-osgi/jena-osgi-test}/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java (100%)
 rename {jena-osgi-test => apache-jena-osgi/jena-osgi-test}/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java (100%)
 rename {jena-osgi-test => apache-jena-osgi/jena-osgi-test}/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java (100%)
 rename {jena-osgi => apache-jena-osgi/jena-osgi}/pom.xml (100%)
 create mode 100644 apache-jena-osgi/pom.xml

diff --git a/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
similarity index 100%
rename from jena-osgi-test/pom.xml
rename to apache-jena-osgi/jena-osgi-test/pom.xml
diff --git a/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
similarity index 100%
rename from jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
rename to apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITest.java
diff --git a/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java
similarity index 100%
rename from jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java
rename to apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestActivator.java
diff --git a/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java b/apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
similarity index 100%
rename from jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
rename to apache-jena-osgi/jena-osgi-test/src/main/java/org/apache/jena/osgi/test/JenaOSGITestImpl.java
diff --git a/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
similarity index 100%
rename from jena-osgi/pom.xml
rename to apache-jena-osgi/jena-osgi/pom.xml
diff --git a/apache-jena-osgi/pom.xml b/apache-jena-osgi/pom.xml
new file mode 100644
index 00000000000..6250917be72
--- /dev/null
+++ b/apache-jena-osgi/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.jena</groupId>
+    <artifactId>jena-parent</artifactId>
+    <version>12-SNAPSHOT</version>
+    <relativePath>../jena-parent</relativePath>
+  </parent> 
+
+  <name>Apache Jena - OSGi</name>
+  <artifactId>apache-jena-osgi</artifactId>
+  <version>2.13.0-SNAPSHOT</version>
+
+  <description>Apache Jena OSGi distribution and test</description>
+  <packaging>pom</packaging>
+
+  <repositories>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://repository.apache.org/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
+  <modules>
+    <module>jena-osgi</module>
+    <module>jena-osgi-test</module>
+  </modules>
+  
+</project>
diff --git a/pom.xml b/pom.xml
index 1da7a46f5bd..7f0e1fe365a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,10 +120,8 @@
 
         <module>apache-jena-libs</module>
         <module>apache-jena</module>
+        <module>apache-jena-osgi</module>
         <module>jena-extras</module>
-        <module>jena-osgi</module>
-	<!-- Breaks the build -->
-	<!--<module>jena-osgi-test</module>-->
       </modules>
     </profile>
   </profiles>

From 2e3a332efb79d38398162af440d4ef2f7b63c126 Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Tue, 3 Feb 2015 12:10:04 +0000
Subject: [PATCH 2/2] Updated jena-osgi*/pom.xml <parent>

---
 apache-jena-osgi/jena-osgi-test/pom.xml |  7 ++-----
 apache-jena-osgi/jena-osgi/pom.xml      | 16 ++++++----------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index d3d5e801776..9ea355c6fc5 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -22,13 +22,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.jena</groupId>
-    <artifactId>jena-parent</artifactId>
-    <version>12-SNAPSHOT</version>
-    <relativePath>../jena-parent</relativePath>
+    <artifactId>apache-jena-osgi</artifactId>
+    <version>2.13.0-SNAPSHOT</version>
   </parent>
-
   <artifactId>jena-osgi-test</artifactId>
-  <version>2.13.0-SNAPSHOT</version>
   <name>Apache Jena - OSGi bundle tests</name>
   <description>Tests for jena-osgi as a bundle</description>
   <packaging>bundle</packaging>
diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index 1637732f27f..1b212455ffc 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -21,21 +21,17 @@
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.jena</groupId>
+  <parent>
+    <groupId>org.apache.jena</groupId>
+    <artifactId>apache-jena-osgi</artifactId>
+    <version>2.13.0-SNAPSHOT</version>
+  </parent>
   <artifactId>jena-osgi</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Jena - OSGi bundle</name>
-  <url>http://jena.apache.org/</url>
-  <version>2.13.0-SNAPSHOT</version>
   <description>
-      Embedding all Jena modules in a single OSGi bundle.
+    Embedding the main Jena modules (iri/core/arq/tdb) in a single OSGi bundle.
   </description>
-  <parent>
-    <groupId>org.apache.jena</groupId>
-    <artifactId>jena-parent</artifactId>
-    <version>12-SNAPSHOT</version>
-    <relativePath>../jena-parent</relativePath>
-  </parent>
 
 
   <!--