Author: reschke Date: Thu Apr 12 14:10:11 2018 New Revision: 1828981 URL: http://svn.apache.org/viewvc?rev=1828981&view=rev Log: OAK-7406: relax guava version range in Import-Package declarations
Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml jackrabbit/oak/trunk/oak-authorization-cug/pom.xml jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml jackrabbit/oak/trunk/oak-blob-cloud/pom.xml jackrabbit/oak/trunk/oak-blob-plugins/pom.xml jackrabbit/oak/trunk/oak-blob/pom.xml jackrabbit/oak/trunk/oak-commons/pom.xml jackrabbit/oak/trunk/oak-core-spi/pom.xml jackrabbit/oak/trunk/oak-core/pom.xml jackrabbit/oak/trunk/oak-exercise/pom.xml jackrabbit/oak/trunk/oak-http/pom.xml jackrabbit/oak/trunk/oak-jcr/pom.xml jackrabbit/oak/trunk/oak-lucene/pom.xml jackrabbit/oak/trunk/oak-parent/pom.xml jackrabbit/oak/trunk/oak-query-spi/pom.xml jackrabbit/oak/trunk/oak-security-spi/pom.xml jackrabbit/oak/trunk/oak-segment-azure/pom.xml jackrabbit/oak/trunk/oak-segment-tar/pom.xml jackrabbit/oak/trunk/oak-solr-core/pom.xml jackrabbit/oak/trunk/oak-solr-osgi/pom.xml jackrabbit/oak/trunk/oak-store-composite/pom.xml jackrabbit/oak/trunk/oak-store-document/pom.xml jackrabbit/oak/trunk/oak-store-spi/pom.xml Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-auth-external/pom.xml (original) +++ jackrabbit/oak/trunk/oak-auth-external/pom.xml Thu Apr 12 14:10:11 2018 @@ -42,6 +42,14 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> + </instructions> + </configuration> </plugin> <plugin> <artifactId>maven-failsafe-plugin</artifactId> Modified: jackrabbit/oak/trunk/oak-authorization-cug/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-authorization-cug/pom.xml (original) +++ jackrabbit/oak/trunk/oak-authorization-cug/pom.xml Thu Apr 12 14:10:11 2018 @@ -41,6 +41,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.spi.security.authorization.cug </Export-Package> Modified: jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml (original) +++ jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml Thu Apr 12 14:10:11 2018 @@ -37,6 +37,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage </Export-Package> Modified: jackrabbit/oak/trunk/oak-blob-cloud/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-blob-cloud/pom.xml (original) +++ jackrabbit/oak/trunk/oak-blob-cloud/pom.xml Thu Apr 12 14:10:11 2018 @@ -37,6 +37,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package>org.apache.jackrabbit.oak.blob.cloud.aws.s3,org.apache.jackrabbit.oak.blob.cloud.s3.stats</Export-Package> <DynamicImport-Package>sun.io</DynamicImport-Package> </instructions> Modified: jackrabbit/oak/trunk/oak-blob-plugins/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-blob-plugins/pom.xml (original) +++ jackrabbit/oak/trunk/oak-blob-plugins/pom.xml Thu Apr 12 14:10:11 2018 @@ -35,6 +35,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.plugins.blob, org.apache.jackrabbit.oak.plugins.blob.datastore, Modified: jackrabbit/oak/trunk/oak-blob/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-blob/pom.xml (original) +++ jackrabbit/oak/trunk/oak-blob/pom.xml Thu Apr 12 14:10:11 2018 @@ -38,6 +38,7 @@ <configuration> <instructions> <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, * </Import-Package> <Export-Package> Modified: jackrabbit/oak/trunk/oak-commons/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-commons/pom.xml (original) +++ jackrabbit/oak/trunk/oak-commons/pom.xml Thu Apr 12 14:10:11 2018 @@ -36,6 +36,14 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> + </instructions> + </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> Modified: jackrabbit/oak/trunk/oak-core-spi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core-spi/pom.xml (original) +++ jackrabbit/oak/trunk/oak-core-spi/pom.xml Thu Apr 12 14:10:11 2018 @@ -35,6 +35,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.cache, org.apache.jackrabbit.oak.commons.jmx, Modified: jackrabbit/oak/trunk/oak-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-core/pom.xml Thu Apr 12 14:10:11 2018 @@ -45,6 +45,7 @@ <configuration> <instructions> <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, com.codahale.metrics*;version="[3.1, 4)";resolution:=optional, * </Import-Package> Modified: jackrabbit/oak/trunk/oak-exercise/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-exercise/pom.xml (original) +++ jackrabbit/oak/trunk/oak-exercise/pom.xml Thu Apr 12 14:10:11 2018 @@ -63,6 +63,7 @@ </Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, *;resolution:=optional </Import-Package> <Export-Package> Modified: jackrabbit/oak/trunk/oak-http/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-http/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-http/pom.xml (original) +++ jackrabbit/oak/trunk/oak-http/pom.xml Thu Apr 12 14:10:11 2018 @@ -38,6 +38,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> ! </Export-Package> Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/pom.xml (original) +++ jackrabbit/oak/trunk/oak-jcr/pom.xml Thu Apr 12 14:10:11 2018 @@ -153,6 +153,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.jcr, org.apache.jackrabbit.oak.jcr.observation.filter Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/pom.xml (original) +++ jackrabbit/oak/trunk/oak-lucene/pom.xml Thu Apr 12 14:10:11 2018 @@ -114,6 +114,7 @@ org.apache.jackrabbit.oak.plugins.index.lucene.spi, </Export-Package> <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, org.apache.lucene.sandbox.*;resolution:=optional, !org.apache.lucene.*, !org.apache.jackrabbit.oak.cache, Modified: jackrabbit/oak/trunk/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-parent/pom.xml (original) +++ jackrabbit/oak/trunk/oak-parent/pom.xml Thu Apr 12 14:10:11 2018 @@ -58,6 +58,7 @@ <h2.version>1.4.194</h2.version> <tika.version>1.17</tika.version> <guava.version>15.0</guava.version> + <guava.osgi.import>com.google.common.*;version="[15.0,21)"</guava.osgi.import> <findbugs.version>3.0.4</findbugs.version> <derby.version>10.14.1.0</derby.version> <java.version>1.8</java.version> Modified: jackrabbit/oak/trunk/oak-query-spi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-query-spi/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-query-spi/pom.xml (original) +++ jackrabbit/oak/trunk/oak-query-spi/pom.xml Thu Apr 12 14:10:11 2018 @@ -38,6 +38,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.query.facet, org.apache.jackrabbit.oak.spi.query, Modified: jackrabbit/oak/trunk/oak-security-spi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/pom.xml (original) +++ jackrabbit/oak/trunk/oak-security-spi/pom.xml Thu Apr 12 14:10:11 2018 @@ -44,6 +44,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.plugins.tree, org.apache.jackrabbit.oak.spi.security, Modified: jackrabbit/oak/trunk/oak-segment-azure/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-azure/pom.xml (original) +++ jackrabbit/oak/trunk/oak-segment-azure/pom.xml Thu Apr 12 14:10:11 2018 @@ -39,6 +39,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package></Export-Package> <Embed-Dependency> azure-storage, Modified: jackrabbit/oak/trunk/oak-segment-tar/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original) +++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Thu Apr 12 14:10:11 2018 @@ -53,6 +53,7 @@ concurrentlinkedhashmap-lru </Embed-Dependency> <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, com.codahale.metrics*;version="[3.1,4)", com.google.protobuf;version="[2.6,3)";resolution:=optional, com.google.protobuf.nano;resolution:=optional, Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Thu Apr 12 14:10:11 2018 @@ -74,6 +74,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> !* </Export-Package> Modified: jackrabbit/oak/trunk/oak-solr-osgi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-osgi/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-osgi/pom.xml (original) +++ jackrabbit/oak/trunk/oak-solr-osgi/pom.xml Thu Apr 12 14:10:11 2018 @@ -40,6 +40,7 @@ <configuration> <instructions> <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, org.apache.lucene.*;resolution:=optional, com.googlecode.*;resolution:=optional, com.vividsolutions.jts.*;resolution:=optional, Modified: jackrabbit/oak/trunk/oak-store-composite/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-store-composite/pom.xml (original) +++ jackrabbit/oak/trunk/oak-store-composite/pom.xml Thu Apr 12 14:10:11 2018 @@ -36,6 +36,14 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> + </instructions> + </configuration> </plugin> <plugin> <artifactId>maven-failsafe-plugin</artifactId> Modified: jackrabbit/oak/trunk/oak-store-document/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-store-document/pom.xml (original) +++ jackrabbit/oak/trunk/oak-store-document/pom.xml Thu Apr 12 14:10:11 2018 @@ -39,6 +39,7 @@ <configuration> <instructions> <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, com.mongodb*;version="[3.6, 4)";resolution:=optional, * </Import-Package> Modified: jackrabbit/oak/trunk/oak-store-spi/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/pom.xml?rev=1828981&r1=1828980&r2=1828981&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-store-spi/pom.xml (original) +++ jackrabbit/oak/trunk/oak-store-spi/pom.xml Thu Apr 12 14:10:11 2018 @@ -35,6 +35,10 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> + <Import-Package> + <!-- OAK-7182 -->${guava.osgi.import}, + * + </Import-Package> <Export-Package> org.apache.jackrabbit.oak.json, org.apache.jackrabbit.oak.spi.cluster,