You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/02/14 18:59:31 UTC
svn commit: r1244138 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
Author: rfscholte
Date: Tue Feb 14 17:59:31 2012
New Revision: 1244138
URL: http://svn.apache.org/viewvc?rev=1244138&view=rev
Log:
MRELEASE-638: release:prepare fails w/ java.lang.ClassFormatError: Invalid pc in LineNumberTable in class file org/apache/commons/lang/StringUtils
replacing commons-lang.StringUtils with plexus.StringUtils
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?rev=1244138&r1=1244137&r2=1244138&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java Tue Feb 14 17:59:31 2012
@@ -19,7 +19,6 @@ package org.apache.maven.shared.release.
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
@@ -37,6 +36,7 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.Arrays;
@@ -86,7 +86,7 @@ public class ScmCheckModificationsPhase
}
logInfo( relResult, "Verifying that there are no local modifications..." );
- logInfo( relResult, " ignoring changes on: " + StringUtils.join( excludedFiles, ", " ) );
+ logInfo( relResult, " ignoring changes on: " + StringUtils.join( excludedFiles.toArray(), ", " ) );
ScmRepository repository;
ScmProvider provider;