You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2016/01/27 17:05:50 UTC
svn commit: r1727106 - in /jackrabbit/oak/trunk:
oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/
oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/
oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/st...
Author: mduerig
Date: Wed Jan 27 16:05:49 2016
New Revision: 1727106
URL: http://svn.apache.org/viewvc?rev=1727106&view=rev
Log:
OAK-3842: Adjust package export declarations
Remove version declaration from packages not intented to be used externally. Exclude those from the baseline check. Configure bundle plugin to not default to bundle version for the export version.
Removed:
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/package-info.java
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/package-info.java
jackrabbit/oak/trunk/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/stats/package-info.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/benchmark/package-info.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/cache/package-info.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/package-info.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/package-info.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/package-info.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/package-info.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/json/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/jmx/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lock/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/package-info.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/package-info.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/package-info.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/package-info.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/package-info.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/http/package-info.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/package-info.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/package-info.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/package-info.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/package-info.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/package-info.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/util/package-info.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java?rev=1727106&r1=1727105&r2=1727106&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java Wed Jan 27 16:05:49 2016
@@ -17,5 +17,4 @@
@Version("1.1.0")
package org.apache.jackrabbit.oak.spi.security.authentication;
-import aQute.bnd.annotation.Version;
-import aQute.bnd.annotation.Export;
\ No newline at end of file
+import aQute.bnd.annotation.Version;
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1727106&r1=1727105&r2=1727106&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Wed Jan 27 16:05:49 2016
@@ -131,16 +131,6 @@
</Embed-Dependency>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>baseline</id>
- <configuration>
- <filters>
- <filter>org.apache.jackrabbit.oak.*</filter>
- </filters>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1727106&r1=1727105&r2=1727106&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Jan 27 16:05:49 2016
@@ -121,6 +121,9 @@
http://jackrabbit.apache.org/oak/
</Bundle-DocURL>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <!-- Don't default to bundle version for packages without explicit export version.
+ See FELIX-5172 -->
+ <_nodefaultversion>true</_nodefaultversion>
</instructions>
</configuration>
<!-- OAK-3041: use updated Bnd -->
@@ -139,10 +142,77 @@
</goals>
<phase>pre-integration-test</phase>
<configuration>
- <!--<comparisonVersion>1.2.0</comparisonVersion>-->
<logResults>false</logResults>
<failOnWarning>false</failOnWarning>
<failOnError>true</failOnError>
+ <filters>
+ <!-- Disable baseline for explicitly NOT managed packages. See OAK-3842 -->
+ <filter>!org.apache.jackrabbit.oak.commons</filter>
+ <filter>!org.apache.jackrabbit.oak.commons.benchmark</filter>
+ <filter>!org.apache.jackrabbit.oak.commons.cache</filter>
+ <filter>!org.apache.jackrabbit.oak.commons.concurrent</filter>
+ <filter>!org.apache.jackrabbit.oak.commons.io</filter>
+ <filter>!org.apache.jackrabbit.oak.commons.jmx</filter>
+ <filter>!org.apache.jackrabbit.oak.commons.json</filter>
+ <filter>!org.apache.jackrabbit.oak.commons.sort</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.blob</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.blob.split</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.blob.stats</filter>
+ <filter>!org.apache.jackrabbit.oak.blob.cloud.aws.s3</filter>
+ <filter>!org.apache.jackrabbit.oak</filter>
+ <filter>!org.apache.jackrabbit.oak.json</filter>
+ <filter>!org.apache.jackrabbit.oak.management</filter>
+ <filter>!org.apache.jackrabbit.oak.namepath</filter>
+ <filter>!org.apache.jackrabbit.oak.osgi</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.atomic</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.commit</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.identifier</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.aggregate</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.counter</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.fulltext</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.nodetype</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.property</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.property.jmx</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.reference</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.itemsave</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.lock</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.memory</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.name</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.nodetype</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.nodetype.write</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.observation</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.observation.filter</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.value</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.version</filter>
+ <filter>!org.apache.jackrabbit.oak.query</filter>
+ <filter>!org.apache.jackrabbit.oak.query.fulltext</filter>
+ <filter>!org.apache.jackrabbit.oak.security</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.commit</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.gc</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.lifecycle</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.query</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.state</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.whiteboard</filter>
+ <filter>!org.apache.jackrabbit.oak.spi.xml</filter>
+ <filter>!org.apache.jackrabbit.oak.stats</filter>
+ <filter>!org.apache.jackrabbit.oak.util</filter>
+ <filter>!org.apache.jackrabbit.oak.jcr</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.lucene</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.lucene.util</filter>
+ <filter>!org.apache.jackrabbit.oak.security.authentication.ldap</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.backup</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.segment</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.segment.file</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.segment.http</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.solr</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.solr.configuration</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.solr.index</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.solr.query</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.solr.server</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.index.solr.util</filter>
+ <filter>*</filter>
+ </filters>
</configuration>
</execution>
</executions>