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 ch...@apache.org on 2017/07/07 09:22:53 UTC
svn commit: r1801134 - in /jackrabbit/oak/trunk: oak-api/
oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/ oak-blob-plugins/
oak-core-spi/
oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/
oak-parent/ oak-store-composite/ oak-st...
Author: chetanm
Date: Fri Jul 7 09:22:52 2017
New Revision: 1801134
URL: http://svn.apache.org/viewvc?rev=1801134&view=rev
Log:
OAK-6346 - Set baseline plugin comparison version to 1.6.0
Modified:
jackrabbit/oak/trunk/oak-api/pom.xml
jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java
jackrabbit/oak/trunk/oak-blob-plugins/pom.xml
jackrabbit/oak/trunk/oak-core-spi/pom.xml
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-store-composite/pom.xml
jackrabbit/oak/trunk/oak-store-spi/pom.xml
Modified: jackrabbit/oak/trunk/oak-api/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/pom.xml?rev=1801134&r1=1801133&r2=1801134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-api/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-api/pom.xml Fri Jul 7 09:22:52 2017
@@ -34,6 +34,23 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <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>
<groupId>org.apache.felix</groupId>
Modified: jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java?rev=1801134&r1=1801133&r2=1801134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java (original)
+++ jackrabbit/oak/trunk/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/CheckpointMBean.java Fri Jul 7 09:22:52 2017
@@ -51,12 +51,6 @@ public interface CheckpointMBean {
Date getOldestCheckpointCreationDate();
/**
- * @return creation information about oldest checkpoint.
- */
- @Deprecated
- CompositeData getOldestCheckpointCreationTime();
-
- /**
* Create a new checkpoint with the given {@code lifetime}.
* See {@code org.apache.jackrabbit.oak.spi.state.NodeStore#checkpoint}
* @param lifetime
Modified: jackrabbit/oak/trunk/oak-blob-plugins/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/pom.xml?rev=1801134&r1=1801133&r2=1801134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-plugins/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob-plugins/pom.xml Fri Jul 7 09:22:52 2017
@@ -45,6 +45,23 @@
</Export-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>
</plugins>
</build>
Modified: jackrabbit/oak/trunk/oak-core-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/pom.xml?rev=1801134&r1=1801133&r2=1801134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core-spi/pom.xml Fri Jul 7 09:22:52 2017
@@ -47,6 +47,23 @@
</Export-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>
<groupId>org.apache.rat</groupId>
Modified: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java?rev=1801134&r1=1801133&r2=1801134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java (original)
+++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AbstractCheckpointMBean.java Fri Jul 7 09:22:52 2017
@@ -102,24 +102,6 @@ public abstract class AbstractCheckpoint
return new Date(getOldestCheckpointCreationTimestamp());
}
- @Override
- public CompositeData getOldestCheckpointCreationTime() {
- try {
- Map<String, Object> values = Maps.newHashMap();
- long timestamp = getOldestCheckpointCreationTimestamp();
- Date date = getOldestCheckpointCreationDate();
- values.put("timestamp", timestamp);
- values.put("time", date);
- CompositeDataSupport csd = new CompositeDataSupport(
- new CompositeType("OldestCheckpointTime", "Creation time of oldest checkpoint",
- new String[]{"timestamp", "time"}, new String[]{"epoch timestamp", "human readable date"},
- new OpenType[]{SimpleType.LONG, SimpleType.DATE}), values);
-
- return csd;
- } catch (OpenDataException e) {
- throw new IllegalStateException(e);
- }
- }
/**
* Utility method for converting the fields associated with a checkpoint to
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1801134&r1=1801133&r2=1801134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Fri Jul 7 09:22:52 2017
@@ -160,6 +160,8 @@
<logResults>false</logResults>
<failOnWarning>false</failOnWarning>
<failOnError>true</failOnError>
+ <!-- Set the comparisonVersion to last release from stable branch-->
+ <comparisonVersion>1.6.2</comparisonVersion>
<filters>
<!-- Disable baseline for explicitly NOT managed packages. See OAK-3842 -->
<filter>!org.apache.jackrabbit.oak.cache</filter>
Modified: jackrabbit/oak/trunk/oak-store-composite/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/pom.xml?rev=1801134&r1=1801133&r2=1801134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-composite/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-composite/pom.xml Fri Jul 7 09:22:52 2017
@@ -36,6 +36,23 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <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>
<groupId>org.apache.felix</groupId>
Modified: jackrabbit/oak/trunk/oak-store-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/pom.xml?rev=1801134&r1=1801133&r2=1801134&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-spi/pom.xml Fri Jul 7 09:22:52 2017
@@ -50,6 +50,23 @@
</Export-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>