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 re...@apache.org on 2018/11/07 13:46:58 UTC
svn commit: r1846013 - in /jackrabbit/oak/branches/1.8: ./ oak-commons/
oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/
oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/
oak-commons/src/main/java/org/apache/jackrabbit...
Author: reschke
Date: Wed Nov 7 13:46:58 2018
New Revision: 1846013
URL: http://svn.apache.org/viewvc?rev=1846013&view=rev
Log:
OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-commons
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-commons/pom.xml
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/OakVersion.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/QueryUtils.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/package-info.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopReader.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/package-info.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/package-info.java
jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 7 13:46:58 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836175,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836176,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/pom.xml?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/pom.xml Wed Nov 7 13:46:58 2018
@@ -65,8 +65,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java Wed Nov 7 13:46:58 2018
@@ -30,9 +30,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Charsets;
import com.google.common.base.Function;
import com.google.common.base.Strings;
@@ -41,6 +38,8 @@ import com.google.common.collect.Iterato
import com.google.common.collect.PeekingIterator;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.LineIterator;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -246,7 +245,7 @@ public final class FileIOUtils {
* @throws IOException
*/
public static int writeStrings(Iterator<String> iterator, File f, boolean escape,
- @Nonnull Function<String, String> transformer, @Nullable Logger logger, @Nullable String message) throws IOException {
+ @NotNull Function<String, String> transformer, @Nullable Logger logger, @Nullable String message) throws IOException {
BufferedWriter writer = newWriter(f, UTF_8);
boolean threw = true;
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/OakVersion.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/OakVersion.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/OakVersion.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/OakVersion.java Wed Nov 7 13:46:58 2018
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Provides version information about Oak.
@@ -37,7 +37,7 @@ public final class OakVersion {
* @param clazz a class of the module
* @return the version (or "SNAPSHOT" when unknown)
*/
- @Nonnull
+ @NotNull
public static String getVersion(String moduleName, Class clazz) {
String version = "SNAPSHOT"; // fallback
InputStream stream = clazz.getResourceAsStream(
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java Wed Nov 7 13:46:58 2018
@@ -24,8 +24,8 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Utility methods to parse a path.
@@ -102,7 +102,7 @@ public final class PathUtils {
* @param path the path
* @return the parent path
*/
- @Nonnull
+ @NotNull
public static String getParentPath(String path) {
return getAncestorPath(path, 1);
}
@@ -118,7 +118,7 @@ public final class PathUtils {
* calculated.
* @return the ancestor path
*/
- @Nonnull
+ @NotNull
public static String getAncestorPath(String path, int nth) {
assert isValid(path) : "Invalid path ["+path+"]";
@@ -150,7 +150,7 @@ public final class PathUtils {
* @param path the complete path
* @return the last element
*/
- @Nonnull
+ @NotNull
public static String getName(String path) {
assert isValid(path) : "Invalid path ["+path+"]";
@@ -172,8 +172,8 @@ public final class PathUtils {
* @param name name with a possible SNS index suffix
* @return name without the SNS index suffix
*/
- @Nonnull
- public static String dropIndexFromName(@Nonnull String name) {
+ @NotNull
+ public static String dropIndexFromName(@NotNull String name) {
Matcher matcher = SNS_PATTERN.matcher(name);
if (matcher.matches()) {
return matcher.group(1);
@@ -217,7 +217,7 @@ public final class PathUtils {
* @param path the path
* @return an Iterable for the path elements
*/
- @Nonnull
+ @NotNull
public static Iterable<String> elements(final String path) {
assert isValid(path) : "Invalid path ["+path+"]";
@@ -272,7 +272,7 @@ public final class PathUtils {
* @param relativePaths the relative path elements to add
* @return the concatenated path
*/
- @Nonnull
+ @NotNull
public static String concat(String parentPath, String... relativePaths) {
assert isValid(parentPath) : "Invalid parent path ["+parentPath+"]";
int parentLen = parentPath.length();
@@ -303,7 +303,7 @@ public final class PathUtils {
* @param subPath the subPath path to add
* @return the concatenated path
*/
- @Nonnull
+ @NotNull
public static String concat(String parentPath, String subPath) {
assert isValid(parentPath) : "Invalid parent path ["+parentPath+"]";
assert isValid(subPath) : "Invalid sub path ["+subPath+"]";
@@ -330,7 +330,7 @@ public final class PathUtils {
* @param relativePaths relative paths
* @return the concatenated path or {@code null} if the resulting path is empty.
*/
- @CheckForNull
+ @Nullable
public static String concatRelativePaths(String... relativePaths) {
StringBuilder result = new StringBuilder();
for (String path : relativePaths) {
@@ -386,7 +386,7 @@ public final class PathUtils {
* @param path path to relativize
* @return relativized path
*/
- @Nonnull
+ @NotNull
public static String relativize(String parentPath, String path) {
assert isValid(parentPath) : "Invalid parent path ["+parentPath+"]";
assert isValid(path) : "Invalid path ["+path+"]";
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/QueryUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/QueryUtils.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/QueryUtils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/QueryUtils.java Wed Nov 7 13:46:58 2018
@@ -16,9 +16,8 @@
*/
package org.apache.jackrabbit.oak.commons;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
public final class QueryUtils {
@@ -30,8 +29,8 @@ public final class QueryUtils {
* @param string string to escape
* @return escaped string
*/
- @Nonnull
- public static String escapeNodeName(@Nonnull String string) {
+ @NotNull
+ public static String escapeNodeName(@NotNull String string) {
StringBuilder result = new StringBuilder();
int k = 0;
@@ -55,8 +54,8 @@ public final class QueryUtils {
return result.toString();
}
- @Nonnull
- public static String escapeForQuery(@Nonnull String value) {
+ @NotNull
+ public static String escapeForQuery(@NotNull String value) {
StringBuilder ret = new StringBuilder();
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
@@ -70,4 +69,4 @@ public final class QueryUtils {
}
return ret.toString();
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java Wed Nov 7 13:46:58 2018
@@ -19,8 +19,7 @@ package org.apache.jackrabbit.oak.common
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,8 +40,8 @@ public class StringUtils {
* @param value the byte array
* @return the hex encoded string
*/
- @Nonnull
- public static String convertBytesToHex(@Nonnull byte[] value) {
+ @NotNull
+ public static String convertBytesToHex(@NotNull byte[] value) {
checkNotNull(value);
int len = value.length;
char[] buff = new char[len + len];
@@ -61,8 +60,8 @@ public class StringUtils {
* @param s the hex encoded string
* @return the byte array
*/
- @Nonnull
- public static byte[] convertHexToBytes(@Nonnull String s) {
+ @NotNull
+ public static byte[] convertHexToBytes(@NotNull String s) {
checkNotNull(s);
int len = s.length();
checkArgument(len % 2 == 0);
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java Wed Nov 7 13:46:58 2018
@@ -17,20 +17,20 @@
package org.apache.jackrabbit.oak.commons;
import java.util.UUID;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Charsets;
+import org.jetbrains.annotations.NotNull;
+
public final class UUIDUtils {
private UUIDUtils() {}
- @Nonnull
+ @NotNull
public static String generateUUID() {
return UUID.randomUUID().toString();
}
- @Nonnull
+ @NotNull
public static String generateUUID(String hint) {
UUID uuid = UUID.nameUUIDFromBytes(hint.getBytes(Charsets.UTF_8));
return uuid.toString();
@@ -44,4 +44,4 @@ public final class UUIDUtils {
return false;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/ExecutorCloser.java Wed Nov 7 13:46:58 2018
@@ -23,8 +23,7 @@ import java.io.Closeable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
-
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,4 +86,4 @@ public final class ExecutorCloser implem
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/package-info.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/package-info.java Wed Nov 7 13:46:58 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.jackrabbit.oak.commons.concurrent;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopReader.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopReader.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/JsopReader.java Wed Nov 7 13:46:58 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.commons.json;
-import javax.annotation.CheckForNull;
+import org.jetbrains.annotations.Nullable;
/**
* A reader for Json and Jsop strings.
@@ -83,7 +83,7 @@ public interface JsopReader {
* @return the de-escaped string (null when reading a null value)
* @throws IllegalStateException if the token type doesn't match
*/
- @CheckForNull
+ @Nullable
String readString();
/**
@@ -106,7 +106,7 @@ public interface JsopReader {
*
* @return the escaped string (null when reading a null value)
*/
- @CheckForNull
+ @Nullable
String readRawValue();
/**
@@ -116,7 +116,7 @@ public interface JsopReader {
*
* @return the token
*/
- @CheckForNull
+ @Nullable
String getToken();
/**
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/package-info.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/json/package-info.java Wed Nov 7 13:46:58 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.jackrabbit.oak.commons.json;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java Wed Nov 7 13:46:58 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.0")
+@Version("1.1.1")
package org.apache.jackrabbit.oak.commons;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java Wed Nov 7 13:46:58 2018
@@ -19,11 +19,11 @@
package org.apache.jackrabbit.oak.commons.sort;
-import javax.annotation.Nullable;
-
import static com.google.common.base.Preconditions.checkState;
+import org.jetbrains.annotations.Nullable;
+
/**
* Utility class to escape '\n', '\r', '\' char
* while being written to file and unescape then upon getting
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/package-info.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/package-info.java Wed Nov 7 13:46:58 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.jackrabbit.oak.commons.sort;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java Wed Nov 7 13:46:58 2018
@@ -38,8 +38,6 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterators;
@@ -47,6 +45,7 @@ import com.google.common.collect.Sets;
import com.google.common.primitives.Longs;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.commons.FileIOUtils.BurnOnCloseFileIterator;
+import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
Modified: jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java?rev=1846013&r1=1846012&r2=1846013&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java Wed Nov 7 13:46:58 2018
@@ -28,8 +28,6 @@ import java.util.List;
import java.util.Random;
import java.util.TreeSet;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
@@ -38,6 +36,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Lists;
import org.apache.commons.io.LineIterator;
import org.apache.jackrabbit.oak.commons.FileIOUtils.FileLineDifferenceIterator;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static java.util.Arrays.asList;