From dd0593fb1fdb87ec1fb247bd611404f204b827ed Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Tue, 31 Mar 2015 01:16:07 +0100
Subject: [PATCH 1/5] Revert "Remove duplicate surefire plugin"

This reverts commit 3199dd1020e2f6ac06d49f2a230e5f9faad48382.

The surefire-plugin <execution> is needed to run the tests
in a later phase, after the OSGi bundle has been created
---
 apache-jena-osgi/jena-osgi-test/pom.xml | 44 +++++++++++++++----------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index dbebc219cb6..691f9c52a18 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -134,23 +134,6 @@ limitations under the License.
 
   <build>
     <plugins>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <classpathDependencyExcludes>
-            <classpathDependencyExclude>org.slf4j:slf4j-log4j12</classpathDependencyExclude>
-          </classpathDependencyExcludes>
-          <systemPropertyVariables>
-            <!-- So the test can find the current version of jena-osgi -->
-            <jena-osgi.version>${project.version}</jena-osgi.version>
-            <!-- not so noisy OSGi logging -->
-            <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -185,8 +168,33 @@ limitations under the License.
         </executions>
         <configuration>
         </configuration>
-      </plugin>
 
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <classpathDependencyExcludes>
+            <classpathDependencyExclude>org.slf4j:slf4j-log4j12</classpathDependencyExclude>
+          </classpathDependencyExcludes>
+          <systemPropertyVariables>
+            <!-- So the test can find the current version of jena-osgi -->
+            <jena-osgi.version>${project.version}</jena-osgi.version>
+            <!-- not so noisy OSGi logging -->
+            <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
+          </systemPropertyVariables>
+        </configuration>
+        <executions>
+          <execution>
+            <id>default-test</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <!-- delay until integration-test phase -->
+            <phase>integration-test</phase>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

From 60a07379220cf7e20e3c6c0769c8a3a4051ee97a Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Tue, 31 Mar 2015 01:47:54 +0100
Subject: [PATCH 2/5] pom: Document <extensions> and <executions>

---
 apache-jena-osgi/jena-osgi-test/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index 691f9c52a18..29245ac7b73 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -137,6 +137,8 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <!-- re-enable extensions here for older Mavens -->
+        <extensions>true</extensions>
       </plugin>
       <plugin>
         <!-- generate target/pax-exam-links -->
@@ -184,6 +186,8 @@ limitations under the License.
             <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
           </systemPropertyVariables>
         </configuration>
+        <!-- Explicit execution to run in a phase after the OSGi bundle
+             has been created -->
         <executions>
           <execution>
             <id>default-test</id>

From 820fb5e8b5b8eef319b9d2c3a4c65aa875505fb2 Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Tue, 31 Mar 2015 01:48:16 +0100
Subject: [PATCH 3/5] Only optionally import sun.misc

(coming from new dependency Guava)
---
 apache-jena-osgi/jena-osgi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index aed8e19c71d..4110f0b4c2f 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -224,7 +224,7 @@
             <Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package>
             <Embed-Dependency>artifactId=jena*;inline=true,artifactId=xercesImpl;inline=true,artifactId=xml-apis;inline=true</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
-            <Import-Package>!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.xml.*,!org.apache.xerces.*,!org.apache.jena.ext.*,*</Import-Package>
+            <Import-Package>!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.xml.*,!org.apache.xerces.*,!org.apache.jena.ext.*,sun.misc;resolution:=optional,*</Import-Package>
             <Private-Package>org.apache.jena.ext.*</Private-Package>
           </instructions>
         </configuration>

From 1a5914e0f0bacc3185f79fbe228b81bb158888a3 Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Tue, 31 Mar 2015 01:52:09 +0100
Subject: [PATCH 4/5] re-enable <extensions> for bundle-plugin for older Mavens

---
 apache-jena-osgi/jena-osgi/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index 4110f0b4c2f..ab86548d747 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -219,6 +219,8 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <!-- re-enable extensions here for older Mavens -->
+        <extensions>true</extensions>
         <configuration>
           <instructions>
             <Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package>

From 39f665cc9cab92694af4ffe524072303d85c4d89 Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Wed, 1 Apr 2015 22:21:56 +0100
Subject: [PATCH 5/5] Do not export guava

---
 apache-jena-osgi/jena-osgi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index ab86548d747..7acbf4f944b 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -223,7 +223,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package>
+            <Export-Package>com.hp.hpl.jena.*,!org.apache.taverna.ext.*,org.apache.jena.*</Export-Package>
             <Embed-Dependency>artifactId=jena*;inline=true,artifactId=xercesImpl;inline=true,artifactId=xml-apis;inline=true</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
             <Import-Package>!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.xml.*,!org.apache.xerces.*,!org.apache.jena.ext.*,sun.misc;resolution:=optional,*</Import-Package>