[GitHub] amarkevich closed pull request #484: Update maven-bundle-plugin

[GitBox <gi...@apache.org>]

amarkevich closed pull request #484: Update maven-bundle-plugin
URL: https://github.com/apache/cxf/pull/484
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pom.xml b/pom.xml
index 9ecf13d040e..aabe14794d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,7 +436,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.5.4</version>
+                    <version>4.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 6851110d3a7..708c8444149 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -32,6 +32,10 @@
     </parent>
     <properties>
         <cxf.module.name>org.apache.cxf.rs.search</cxf.module.name>
+        <cxf.osgi.import>
+            javax.persistence*;resolution:=optional,
+            org.apache.tika.*;resolution:=optional
+        </cxf.osgi.import>
     </properties>
     <dependencies>
         <dependency>
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 16e384faa2c..45a8000d6da 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -35,7 +35,8 @@
     <cxf.osgi.import>
       javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
       javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
-      javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
+      javax.annotation*;version="${cxf.osgi.javax.annotation.version}",
+      javax.persistence*;resolution:=optional
     </cxf.osgi.import>
     <compilerArguments>-Aopenjpa.source=7 -Aopenjpa.metamodel=true</compilerArguments>
   </properties>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services