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 fr...@apache.org on 2016/10/26 11:34:43 UTC
svn commit: r1766665 - in /jackrabbit/oak/trunk: ./ oak-it/ oak-jcr/
oak-parent/ oak-remote/ oak-run/ oak-segment-tar/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/s...
Author: frm
Date: Wed Oct 26 11:34:42 2016
New Revision: 1766665
URL: http://svn.apache.org/viewvc?rev=1766665&view=rev
Log:
OAK-5007 - Put oak-segment-tar back in the main release cycle
Modified:
jackrabbit/oak/trunk/oak-it/pom.xml
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-remote/pom.xml
jackrabbit/oak/trunk/oak-run/pom.xml
jackrabbit/oak/trunk/oak-segment-tar/pom.xml
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
jackrabbit/oak/trunk/oak-upgrade/pom.xml
jackrabbit/oak/trunk/pom.xml
Modified: jackrabbit/oak/trunk/oak-it/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Wed Oct 26 11:34:42 2016
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${segment.tar.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${segment.tar.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Oct 26 11:34:42 2016
@@ -222,7 +222,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${segment.tar.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -254,7 +254,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${segment.tar.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Oct 26 11:34:42 2016
@@ -74,7 +74,6 @@
<!-- whether skip the surefire unit testing during the integration testing.
Override with -Dsurefire.skip.ut=true when needed -->
<surefire.skip.ut>false</surefire.skip.ut>
- <segment.tar.version>0.0.16</segment.tar.version>
</properties>
<issueManagement>
Modified: jackrabbit/oak/trunk/oak-remote/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/pom.xml?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-remote/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-remote/pom.xml Wed Oct 26 11:34:42 2016
@@ -98,13 +98,13 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${segment.tar.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${segment.tar.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Wed Oct 26 11:34:42 2016
@@ -238,7 +238,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${segment.tar.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/oak/trunk/oak-segment-tar/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/pom.xml?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Wed Oct 26 11:34:42 2016
@@ -23,27 +23,20 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.5.12</version>
- <relativePath />
+ <version>1.6-SNAPSHOT</version>
+ <relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<artifactId>oak-segment-tar</artifactId>
- <version>0.0.17-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Oak Segment Tar</name>
<properties>
- <oak.version>1.5.12</oak.version>
+ <project.version>1.5.12</project.version>
<netty.version>4.0.41.Final</netty.version>
</properties>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/oak/trunk/oak-segment-tar</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/oak/trunk/oak-segment-tar</developerConnection>
- <url>http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar</url>
- </scm>
-
<build>
<plugins>
<plugin>
@@ -117,40 +110,6 @@
</systemPropertyVariables>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -162,25 +121,25 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob-cloud</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -299,14 +258,14 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java Wed Oct 26 11:34:42 2016
@@ -61,8 +61,7 @@ public class LoggingGCMonitor implements
}
@Override
- public void compacted(
- long[] segmentCounts, long[] recordCounts, long[] compactionMapWeights) {
+ public void compacted() {
}
@Override
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java Wed Oct 26 11:34:42 2016
@@ -92,7 +92,7 @@ public class FileStoreBuilder {
private final GCListener gcListener = new GCListener(){
@Override
public void compactionSucceeded(int newGeneration) {
- compacted(null, null, null);
+ compacted();
cacheManager.evictOldGeneration(newGeneration);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java Wed Oct 26 11:34:42 2016
@@ -75,7 +75,7 @@ public class FileStoreGCMonitor implemen
}
@Override
- public void compacted(long[] segmentCounts, long[] recordCounts, long[] compactionMapWeights) {
+ public void compacted() {
lastCompaction = clock.getTime();
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java Wed Oct 26 11:34:42 2016
@@ -710,8 +710,8 @@ public class SegmentCompactionIT {
}
@Override
- public void compacted(long[] segmentCounts, long[] recordCounts, long[] compactionMapWeights) {
- delegate.compacted(segmentCounts, recordCounts, compactionMapWeights);
+ public void compacted() {
+ delegate.compacted();
lastCompacted = System.currentTimeMillis();
}
Modified: jackrabbit/oak/trunk/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/pom.xml?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-upgrade/pom.xml Wed Oct 26 11:34:42 2016
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${segment.tar.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1766665&r1=1766664&r2=1766665&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Wed Oct 26 11:34:42 2016
@@ -59,6 +59,7 @@
<module>oak-examples</module>
<module>oak-it</module>
<module>oak-segment</module>
+ <module>oak-segment-tar</module>
</modules>
<scm>
@@ -102,35 +103,6 @@
<profiles>
<profile>
- <id>all</id>
- <modules>
- <module>oak-parent</module>
- <module>oak-commons</module>
- <module>oak-blob</module>
- <module>oak-blob-cloud</module>
- <module>oak-core</module>
- <module>oak-jcr</module>
- <module>oak-upgrade</module>
- <module>oak-http</module>
- <module>oak-lucene</module>
- <module>oak-solr-core</module>
- <module>oak-solr-osgi</module>
- <module>oak-auth-external</module>
- <module>oak-auth-ldap</module>
- <module>oak-tarmk-standby</module>
- <module>oak-run</module>
- <module>oak-it-osgi</module>
- <module>oak-pojosr</module>
- <module>oak-authorization-cug</module>
- <module>oak-remote</module>
- <module>oak-exercise</module>
- <module>oak-examples</module>
- <module>oak-it</module>
- <module>oak-segment</module>
- <module>oak-segment-tar</module>
- </modules>
- </profile>
- <profile>
<id>doc</id>
<modules>
<module>oak-doc</module>