Author: mreutegg
Date: Tue Sep 26 12:28:48 2017
New Revision: 1809736
URL: http://svn.apache.org/viewvc?rev=1809736&view=rev
Log:
OAK-6665: Move DocumentNodeStore into its own bundle
Added:
jackrabbit/oak/trunk/oak-store-document/
- copied from r1809731, jackrabbit/oak/trunk/oak-core/
Removed:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/InitialContent.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/Oak.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/OakInitializer.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/OakVersion.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/cache/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/core/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/management/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/namepath/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/commit/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/cow/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/index/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/lock/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/metric/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/migration/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/name/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/observation/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/package-info.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/tree/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/version/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/query/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/security/
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/spi/
jackrabbit/oak/trunk/oak-store-document/src/main/resources/org/apache/jackrabbit/oak/builtin_nodetypes.cnd
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/OakTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/cache/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/core/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/namepath/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/commit/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/cow/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/index/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/metric/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/migration/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/name/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/observation/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/tree/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/version/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/query/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/security/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/spi/
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/util/
jackrabbit/oak/trunk/oak-store-document/src/test/resources/META-INF/
jackrabbit/oak/trunk/oak-store-document/src/test/resources/aws.properties
jackrabbit/oak/trunk/oak-store-document/src/test/resources/org/
Modified:
jackrabbit/oak/trunk/oak-store-document/pom.xml
Modified: jackrabbit/oak/trunk/oak-store-document/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/pom.xml?rev=1809736&r1=1809731&r2=1809736&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-document/pom.xml Tue Sep 26 12:28:48 2017
@@ -27,8 +27,8 @@
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
- <artifactId>oak-core</artifactId>
- <name>Oak Core</name>
+ <artifactId>oak-store-document</artifactId>
+ <name>Oak DocumentNodeStore</name>
<packaging>bundle</packaging>
<build>
@@ -40,67 +40,27 @@
<instructions>
<Import-Package>
com.mongodb*;version="[2.14, 4)";resolution:=optional,
- com.codahale.metrics*;version="[3.1, 4)";resolution:=optional,
*
</Import-Package>
- <Export-Package>
- org.apache.jackrabbit.oak,
- org.apache.jackrabbit.oak.management,
- org.apache.jackrabbit.oak.util,
- org.apache.jackrabbit.oak.namepath.impl,
- org.apache.jackrabbit.oak.plugins.atomic,
- org.apache.jackrabbit.oak.plugins.commit,
- org.apache.jackrabbit.oak.plugins.document.spi,
- org.apache.jackrabbit.oak.plugins.identifier,
- org.apache.jackrabbit.oak.plugins.index,
- org.apache.jackrabbit.oak.plugins.index.fulltext,
- org.apache.jackrabbit.oak.plugins.index.aggregate,
- org.apache.jackrabbit.oak.plugins.index.counter,
- org.apache.jackrabbit.oak.plugins.index.importer,
- org.apache.jackrabbit.oak.plugins.index.nodetype,
- org.apache.jackrabbit.oak.plugins.index.property,
- org.apache.jackrabbit.oak.plugins.index.property.jmx,
- org.apache.jackrabbit.oak.plugins.index.property.strategy,
- org.apache.jackrabbit.oak.plugins.index.reference,
- org.apache.jackrabbit.oak.plugins.itemsave,
- org.apache.jackrabbit.oak.plugins.lock,
- org.apache.jackrabbit.oak.plugins.migration,
- org.apache.jackrabbit.oak.plugins.migration.report,
- org.apache.jackrabbit.oak.plugins.name,
- org.apache.jackrabbit.oak.plugins.nodetype,
- org.apache.jackrabbit.oak.plugins.nodetype.write,
- org.apache.jackrabbit.oak.plugins.observation,
- org.apache.jackrabbit.oak.plugins.observation.filter,
- org.apache.jackrabbit.oak.plugins.tree,
- org.apache.jackrabbit.oak.plugins.version,
- org.apache.jackrabbit.oak.spi.security,
- org.apache.jackrabbit.oak.spi.security.authentication,
- org.apache.jackrabbit.oak.spi.security.authentication.callback,
-
org.apache.jackrabbit.oak.spi.security.authentication.credentials,
- org.apache.jackrabbit.oak.spi.security.authentication.token,
- org.apache.jackrabbit.oak.spi.security.authorization,
-
org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol,
- org.apache.jackrabbit.oak.spi.security.authorization.permission,
- org.apache.jackrabbit.oak.spi.security.authorization.restriction,
- org.apache.jackrabbit.oak.spi.security.principal,
- org.apache.jackrabbit.oak.spi.security.privilege,
- org.apache.jackrabbit.oak.spi.security.user,
- org.apache.jackrabbit.oak.spi.security.user.action,
- org.apache.jackrabbit.oak.spi.security.user.util,
- org.apache.jackrabbit.oak.spi.xml,
- org.apache.jackrabbit.oak.security,
- org.apache.jackrabbit.oak.util,
- </Export-Package>
- <Jaas-ModuleClass>
-
org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule,
-
org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl,
-
org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule
- </Jaas-ModuleClass>
- <DynamicImport-Package>
- org.apache.felix.jaas.boot
- </DynamicImport-Package>
</instructions>
</configuration>
+ <executions>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <!--
+ This is required as classes present in this module
+ were part of oak-core. This should be removed
+ post 1.8 release
+ -->
+ <comparisonArtifactId>oak-core</comparisonArtifactId>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
@@ -112,15 +72,6 @@
</systemPropertyVariables>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/test.json</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -165,23 +116,11 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-query-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-commons</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob</artifactId>
<version>${project.version}</version>
</dependency>
@@ -195,13 +134,7 @@
<artifactId>oak-store-spi</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-store-spi</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+
<!-- General utility libraries -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -215,11 +148,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <optional>true</optional>
- </dependency>
<!-- Optional dependencies for different persistence backends -->
<dependency>
@@ -228,13 +156,6 @@
<optional>true</optional>
</dependency>
- <!-- Optional dependency for jclouds s3 to enable s3 cloud store -->
- <dependency>
- <groupId>org.apache.jclouds.provider</groupId>
- <artifactId>aws-s3</artifactId>
- <optional>true</optional>
- </dependency>
-
<!-- Required for the persistent cache -->
<dependency>
<groupId>com.h2database</groupId>
@@ -272,13 +193,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.inventory</artifactId>
- <version>1.0.4</version>
- <optional>true</optional>
- </dependency>
-
<!-- Findbugs annotations -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -320,11 +234,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<scope>test</scope>
@@ -336,6 +245,12 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -349,6 +264,20 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-commons</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-store-spi</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>test</scope>
@@ -359,11 +288,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<scope>test</scope>
@@ -380,5 +304,10 @@
<version>2.0.6</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
