Skip to content

Commit

Permalink
Merge pull request #3 from apache/trunk
Browse files Browse the repository at this point in the history
sync with origin
  • Loading branch information
ist-rw authored Jun 7, 2017
2 parents 7565250 + a1f5df1 commit 841ebe7
Show file tree
Hide file tree
Showing 1,847 changed files with 61,664 additions and 50,318 deletions.
16 changes: 13 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,20 @@
# limitations under the License.

sudo: false
install: mvn --batch-mode -DskipTests install -pl :oak-segment,:oak-segment-tar -am
script: mvn --batch-mode clean verify -PintegrationTesting -Dnsfixtures=DOCUMENT_NS -pl ':oak-lucene,!:oak-segment-tar,!:oak-segment' -am
env:
- MODULE=oak-jcr
- MODULE=oak-core
- MODULE=oak-it
- MODULE=oak-lucene
- MODULE=oak-run
- MODULE=oak-it-osgi
- MODULE=oak-pojosr
- MODULE=oak-upgrade
install: mvn --batch-mode -DskipTests -Dbaseline.skip=true install -pl :${MODULE} -am -nsu
script: mvn --batch-mode clean verify -Dbaseline.skip=true -PintegrationTesting -Dnsfixtures=DOCUMENT_NS -pl :${MODULE} -nsu
language: java
jdk:
- oraclejdk7
- oraclejdk8
cache:
directories:
- $HOME/.m2
Expand All @@ -28,6 +37,7 @@ addons:
- mongodb-upstart
packages:
- mongodb-org-server
- oracle-java8-installer
notifications:
email: false
webhooks:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
=======================================================
Jackrabbit Oak - the next generation content repository
=======================================================

Expand Down Expand Up @@ -60,6 +59,7 @@ The build consists of the following main components:
- oak-lucene - Lucene-based query index
- oak-run - runnable jar packaging
- oak-pojosr - integration with PojoSR
- oak-segment-tar - TarMK API and implementation
- oak-upgrade - tooling for upgrading Jackrabbit repositories to Oak
- oak-it - integration tests
- oak-it/osgi - integration tests for OSGi
Expand Down
136 changes: 71 additions & 65 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Release Notes -- Apache Jackrabbit Oak -- Version 1.5.18
Release Notes -- Apache Jackrabbit Oak -- Version 1.7.1

Introduction
------------
Expand All @@ -7,91 +7,97 @@ Jackrabbit Oak is a scalable, high-performance hierarchical content
repository designed for use as the foundation of modern world-class
web sites and other demanding content applications.

Apache Jackrabbit Oak 1.5.18 is an unstable release cut directly from
Apache Jackrabbit Oak 1.7.1 is an unstable release cut directly from
Jackrabbit Oak trunk, with a focus on new features and other
improvements. For production use we recommend the latest stable 1.4.x
improvements. For production use we recommend the latest stable 1.6.x
release.

The Oak effort is a part of the Apache Jackrabbit project.
Apache Jackrabbit is a project of the Apache Software Foundation.

Changes in Oak 1.5.18
Changes in Oak 1.7.1
---------------------

Sub-task

[OAK-6227] - There should be a way to retrieve oldest timestamp to
keep from nodestores

Technical task

[OAK-5414] - Refactor LuceneIndexEditor to move out logic related
to making Lucene Document to separate class
[OAK-5415] - Refactor Binary text extraction logic from
LuceneIndexEditor
[OAK-5430] - Provide an extension point in DocumentNodeStore
Journal support
[OAK-5431] - Expose withAsyncIndexing name variant in Jcr builder
[OAK-4612] - Multiplexing support for CugPermissionProvider
[OAK-6196] - Improve Javadoc of multiplexing SPI
[OAK-6270] - There should be a way for editors to be notified by
AsyncIndexUpdate about success/failure of indexing commit
[OAK-6282] - Implement a DummyDataStore to be used to test setup
with no BlobStore access

Bug

[OAK-4954] - SetPropertyTest benchmark fails on Segment Tar
[OAK-5304] - DefaultSyncContext.sync(ExternalIdentity) does not
verify same identity provider
[OAK-5326] - Not able to move segment store directory on
filesystem after closing FileStore
[OAK-5328] - Fix the errors reported by the Javadoc tool in JDK8
[OAK-5348] - ChangeCollectorProvider should be registered as
EditorProvider
[OAK-5413] - XPath: "union" combined with "or" is not converted
correctly
[OAK-5416] - Async reindex of a sync property does't release
created checkpoint
[OAK-5423] - MultiplexingNodeStoreService: Missing element AD in
element OCD
[OAK-5436] - o.a.j.o.segment.file.Manifest#load leaks a file
descriptor
[OAK-5454] - Failed test:
org.apache.jackrabbit.oak.plugins.blob.CachingDataStoreTest.zeroStagingCacheAddGetDelete
[OAK-5461] - [BlobGC] BlobIdTracker remove() should merge
generations
[OAK-5462] - Expensive NodeDocument.split() with multi-valued
binary property
[OAK-5465] - StandbyClientSyncExecution uses an unbound segment
cache
[OAK-5471] - Too many files with unapproved license
[OAK-5573] -
org.apache.jackrabbit.oak.segment.standby.StandbyTestIT.testSyncLoop
[OAK-6266] - SolrQueryIndexProviderService should always have
NodeAggregator
[OAK-6267] - Version restore fails if restore would not change
bundling root but changes bundled nodes
[OAK-6273] -
FilteringNodeStateTest#shouldHaveCorrectChildOrderProperty is
failing
[OAK-6277] - UserQueryManager: redundant check for colliding bound
and offset
[OAK-6278] - UserQueryManager: scope filtering for everyone
groupId compares to principal name
[OAK-6283] - FileCache should ignore when file evicted with
replacement
[OAK-6290] - UserQueryManager.findAuthorizables fails with
IllegalArgumentException when there are multiple selectors
[OAK-6292] - SecurityProviderRegistration.maybeUnregister: typo on
comment
[OAK-6293] - Enable test log creation for oak-blob-plugins
[OAK-6300] - CacheConsistencyTestBase: potential NPE in teardown
[OAK-6306] - upgrade uses lucene wrong version (transient
dependency)

Improvement

[OAK-4808] - Index external changes as part of NRT indexing
[OAK-4809] - JMX Stats for NRT Indexing
[OAK-5406] - LuceneIndexEditor context should only log perf log if
index is updated
[OAK-5417] - Refactor registration of PropertyIndexAsyncReindex
[OAK-5421] - Add LuceneDoc directly to queue from
LuceneIndexEditor
[OAK-5425] - Log warning when revision GC is skipped
[OAK-5438] - FileStore and ReadOnlyFileStore might leak journal
file descriptors
[OAK-5443] - VersionGarbageCollector:measure time to sort docIds
separately
[OAK-5448] - Aggregate logic should optimize for case where
patterns do not include wildcard
[OAK-5452] - Fix typo in CheckpointMBean type value
[OAK-5456] - Reduce reads in NodeDocument.getVisibleChanges()
[OAK-5474] - Use random ports when running Cold Standby tests
[OAK-2808] - Active deletion of 'deleted' Lucene index files from
DataStore without relying on full scale Blob GC
[OAK-3498] - DN can't be used as the group name in the external
auth handler
[OAK-4513] - Detect and log references across stores
[OAK-5525] - VisibleEditor should use the NodeStateUtils to
determine visibility
[OAK-5935] - AbstractSharedCachingDataStore#getRecordIfStored
should use the underlying cache.get
[OAK-6256] - Prevent creating the across-mounts references
[OAK-6272] - AbstractNodeState.toString does not scale to many
child nodes
[OAK-6289] - Unreferenced argument reference in method
SegmentBufferWriter.writeRecordId
[OAK-6296] - Move JACKRABBIT_2_SINGLE_QUOTED_PHRASE from
o.a.j.oak.query.ask.FullTextSearchImpl to
oak.fulltext.FullTextParser
[OAK-6298] - FacetHelper should have private constructor
[OAK-6299] - FilterIterators should have a private constructor
[OAK-6301] - Make QueryEngineSettingsMBeanImpl an inner class of
o.a.j.oak.Oak
[OAK-6302] - UserInitializer: createSystemRoot can get null value
for QueryEngineSettings
[OAK-6307] - Function to find all large docs in Mongo

Task

[OAK-5136] - remove prefiltering testmode (feature/config) before
1.6
[OAK-5230] - AsyncIndexService should ensure that async lanes
should confirm to naming convention
[OAK-5320] - Update Oak trunk to Jackrabbit 2.14.0
[OAK-5335] - Clarify the various directories and their usages in
SegmentNodeStoreService
[OAK-5422] - Increase the DocumentQueue size to 10000
[OAK-5432] - update html unit test dependency
[OAK-5445] - Log the path of LuceneDoc while adding it to queue
[OAK-5466] - Switch to oak-segment-tar in pojosr module
[OAK-6280] - Expose whiteboard from NodeStoreFixture to provide
access to NodeStore components
[OAK-6281] - Dump metrics data to system out if metrics option is
enabled

Test

[OAK-5882] - Improve coverage for oak.security code in oak-core

In addition to the above-mentioned changes, this release contains
all changes included up to the Apache Jackrabbit Oak 1.5.x release.
all changes included up to the Apache Jackrabbit Oak 1.7.x release.

For more detailed information about all the changes in this and other
Oak releases, please see the Oak issue tracker at
Expand Down
5 changes: 1 addition & 4 deletions oak-core/README.md → oak-api/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
Oak Core
========

Oak API
-------
=======

The API for accessing core Oak functionality is located in the
`org.apache.jackrabbit.oak.api` package and consists of the following
Expand Down
107 changes: 107 additions & 0 deletions oak-api/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
<version>1.8-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>oak-api</artifactId>
<packaging>bundle</packaging>

<name>Oak API</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<java.util.logging.config.file>
src/test/resources/logging.properties
</java.util.logging.config.file>
</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>

<dependencies>
<!-- Optional OSGi dependencies, used only when running within OSGi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
<scope>provided</scope>
</dependency>

<!-- JCR and Jackrabbit dependencies -->
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>2.0</version>
</dependency>

<!-- Findbugs annotations -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public interface PropertyState {
* If the target type is not the same as the type of this property an attempt
* is made to convert the value to the target type. If the conversion fails an
* exception is thrown. The actual conversions which take place are those defined
* in the {@link org.apache.jackrabbit.oak.plugins.value.Conversions} class.
* in the {@code org.apache.jackrabbit.oak.plugins.value.Conversions} class.
* @param type target type
* @param <T>
* @return the value of this property
Expand All @@ -81,7 +81,7 @@ public interface PropertyState {
* If the target type is not the same as the type of this property an attempt
* is made to convert the value to the target type. If the conversion fails an
* exception is thrown. The actual conversions which take place are those defined
* in the {@link org.apache.jackrabbit.oak.plugins.value.Conversions} class.
* in the {@code org.apache.jackrabbit.oak.plugins.value.Conversions} class.
* @param type target type
* @param index
* @param <T>
Expand Down
Loading

0 comments on commit 841ebe7

Please sign in to comment.