Author: struberg
Date: Fri Aug 31 08:27:26 2012
New Revision: 1379355
URL: http://svn.apache.org/viewvc?rev=1379355&view=rev
Log:
MSHARED-239 move plexus-utils to maven-shared-utils
Modified:
maven/shared/trunk/file-management/pom.xml
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
maven/shared/trunk/maven-ant/pom.xml
maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntProjectPopulator.java
maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntPropertyHelper.java
maven/shared/trunk/maven-archiver/pom.xml
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
maven/shared/trunk/maven-artifact-resolver/pom.xml
maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java
Modified: maven/shared/trunk/file-management/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/pom.xml?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
--- maven/shared/trunk/file-management/pom.xml (original)
+++ maven/shared/trunk/file-management/pom.xml Fri Aug 31 08:27:26 2012
@@ -69,12 +69,13 @@ under the License.
<version>1.1</version>
</dependency>
- <!-- Plexus -->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.5.6</version>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
+
+ <!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
Fri Aug 31 08:27:26 2012
@@ -20,7 +20,7 @@ package org.apache.maven.shared.model.fi
*/
import org.apache.maven.shared.model.fileset.Mapper;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.maven.shared.utils.io.IOUtil;
import java.io.IOException;
import java.io.InputStream;
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
Fri Aug 31 08:27:26 2012
@@ -29,9 +29,9 @@ import org.apache.maven.shared.model.fil
import org.apache.maven.shared.model.fileset.mappers.FileNameMapper;
import org.apache.maven.shared.model.fileset.mappers.MapperException;
import org.apache.maven.shared.model.fileset.mappers.MapperUtil;
+import org.apache.maven.shared.utils.io.DirectoryScanner;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
Modified:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
(original)
+++
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Fri Aug 31 08:27:26 2012
@@ -31,9 +31,9 @@ import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.maven.shared.model.fileset.FileSet;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.cli.CommandLineException;
-import org.codehaus.plexus.util.cli.Commandline;
+import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.apache.maven.shared.utils.cli.Commandline;
+import org.apache.maven.shared.utils.io.FileUtils;
/**
* Test the FileSet
@@ -88,7 +88,7 @@ public class FileSetUtilsTest
/**
* @throws IOException if any
* @throws InterruptedException if any
- * @throws CommandLineException if any
+ * @throws org.apache.maven.shared.utils.cli.CommandLineException if any
*/
public void testIncludesDontFollowSymlinks()
throws IOException, InterruptedException, CommandLineException
Modified: maven/shared/trunk/maven-ant/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-ant/pom.xml?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
--- maven/shared/trunk/maven-ant/pom.xml (original)
+++ maven/shared/trunk/maven-ant/pom.xml Fri Aug 31 08:27:26 2012
@@ -72,6 +72,12 @@ under the License.
<version>2.0.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.6.5</version>
Modified:
maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntProjectPopulator.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntProjectPopulator.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntProjectPopulator.java
(original)
+++
maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntProjectPopulator.java
Fri Aug 31 08:27:26 2012
@@ -11,7 +11,7 @@ import org.apache.maven.shared.ant.compo
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.artifact.Artifact;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
import java.util.List;
import java.util.Collection;
Modified:
maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntPropertyHelper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntPropertyHelper.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntPropertyHelper.java
(original)
+++
maven/shared/trunk/maven-ant/src/main/java/org/apache/maven/shared/ant/AntPropertyHelper.java
Fri Aug 31 08:27:26 2012
@@ -22,7 +22,7 @@ import org.apache.maven.project.MavenPro
import org.apache.tools.ant.PropertyHelper;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
+import org.apache.maven.shared.utils.introspection.ReflectionValueExtractor;
import java.io.File;
import java.util.Hashtable;
Modified: maven/shared/trunk/maven-archiver/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/pom.xml (original)
+++ maven/shared/trunk/maven-archiver/pom.xml Fri Aug 31 08:27:26 2012
@@ -80,15 +80,23 @@
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>2.1</version>
</dependency>
<dependency>
+ <!-- plexus-archiver needs this -->
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0</version>
</dependency>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
Modified:
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
(original)
+++
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Fri Aug 31 08:27:26 2012
@@ -43,7 +43,7 @@ import org.codehaus.plexus.interpolation
import org.codehaus.plexus.interpolation.RecursionInterceptor;
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
import org.codehaus.plexus.interpolation.ValueSource;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* @author <a href="[email protected]">Emmanuel Venisse</a>
Modified:
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
(original)
+++
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
Fri Aug 31 08:27:26 2012
@@ -30,7 +30,7 @@ import java.util.Properties;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.maven.shared.utils.io.IOUtil;
/**
Modified:
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
(original)
+++
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
Fri Aug 31 08:27:26 2012
@@ -36,8 +36,8 @@ import org.apache.maven.settings.Setting
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.StringUtils;
import java.io.File;
import java.io.IOException;
Modified: maven/shared/trunk/maven-artifact-resolver/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/pom.xml?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-resolver/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-resolver/pom.xml Fri Aug 31 08:27:26 2012
@@ -79,6 +79,11 @@ under the License.
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
Modified:
maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java?rev=1379355&r1=1379354&r2=1379355&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java
(original)
+++
maven/shared/trunk/maven-artifact-resolver/src/test/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolverIT.java
Fri Aug 31 08:27:26 2012
@@ -44,12 +44,12 @@ import org.apache.maven.project.ProjectB
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.artifact.resolver.testutil.ModelCreator;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
import
org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
