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 2020/03/18 17:45:22 UTC
svn commit: r1875379 - in /jackrabbit/oak/branches/1.10: ./ oak-upgrade/
oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/
oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/
oak-upgrade/src/main/java/org/apache/jackrabbit/...
Author: reschke
Date: Wed Mar 18 17:45:22 2020
New Revision: 1875379
URL: http://svn.apache.org/viewvc?rev=1875379&view=rev
Log:
OAK-8851: oak-upgrade: switch to commons-lang3 (merged r1872599 into 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-upgrade/pom.xml
jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java
jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java
jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1872599
Modified: jackrabbit/oak/branches/1.10/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-upgrade/pom.xml?rev=1875379&r1=1875378&r2=1875379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/branches/1.10/oak-upgrade/pom.xml Wed Mar 18 17:45:22 2020
@@ -145,8 +145,8 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Modified: jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1875379&r1=1875378&r2=1875379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java (original)
+++ jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java Wed Mar 18 17:45:22 2020
@@ -28,7 +28,7 @@ import javax.jcr.RepositoryException;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
Modified: jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java?rev=1875379&r1=1875378&r2=1875379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java (original)
+++ jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java Wed Mar 18 17:45:22 2020
@@ -26,7 +26,7 @@ import java.io.IOException;
import javax.jcr.RepositoryException;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.core.RepositoryContext;
import org.apache.jackrabbit.core.config.RepositoryConfig;
Modified: jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java?rev=1875379&r1=1875378&r2=1875379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java (original)
+++ jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java Wed Mar 18 17:45:22 2020
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.upgrade.cli.parser;
-import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.commons.lang3.text.StrSubstitutor;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.upgrade.cli.blob.BlobStoreFactory;
import org.apache.jackrabbit.oak.upgrade.cli.blob.ConstantBlobStoreFactory;
Modified: jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java?rev=1875379&r1=1875378&r2=1875379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java (original)
+++ jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java Wed Mar 18 17:45:22 2020
@@ -21,7 +21,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java?rev=1875379&r1=1875378&r2=1875379&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java (original)
+++ jackrabbit/oak/branches/1.10/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java Wed Mar 18 17:45:22 2020
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.upgrade.cli.parser;
-import static org.apache.commons.lang.StringUtils.removeStart;
+import static org.apache.commons.lang3.StringUtils.removeStart;
import static org.apache.jackrabbit.oak.segment.azure.util.AzureConfigurationParserUtils.KEY_ACCOUNT_NAME;
import static org.apache.jackrabbit.oak.segment.azure.util.AzureConfigurationParserUtils.KEY_CONNECTION_STRING;
import static org.apache.jackrabbit.oak.segment.azure.util.AzureConfigurationParserUtils.KEY_CONTAINER_NAME;
@@ -222,4 +222,4 @@ public enum StoreType {
public boolean isSegment() {
return this == SEGMENT || this == SEGMENT_TAR || this == SEGMENT_AZURE;
}
-}
\ No newline at end of file
+}