This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new f2c6f57 Update maven-bundle-plugin (#484)
f2c6f57 is described below
commit f2c6f57bb73ef435b6c4965766551fd452110677
Author: Alexey Markevich <amarkev...@talend.com>
AuthorDate: Wed Dec 19 23:02:34 2018 +0300
Update maven-bundle-plugin (#484)
* Update maven-bundle-plugin
* explicit optional imports
---
pom.xml | 2 +-
rt/rs/extensions/search/pom.xml | 4 ++++
rt/rs/security/oauth-parent/oauth2/pom.xml | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6054821..f761d92 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 6851110..708c844 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 16e384f..45a8000 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>
