You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/24 08:51:22 UTC
svn commit: r178122 - in /maven/maven-1/core/trunk: ./
src/java/org/apache/maven/ src/java/org/apache/maven/jelly/
src/java/org/apache/maven/plugin/ src/java/org/apache/maven/util/
src/java/org/apache/maven/verifier/ src/test/java/org/apache/maven/project/
xdocs/reference/
Author: brett
Date: Mon May 23 23:51:21 2005
New Revision: 178122
URL: http://svn.apache.org/viewcvs?rev=178122&view=rev
Log:
clean house with respect to dependencies
Modified:
maven/maven-1/core/trunk/project.xml
maven/maven-1/core/trunk/src/java/org/apache/maven/ArtifactListBuilder.java
maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginCacheManager.java
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/StringTool.java
maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java
maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml
Modified: maven/maven-1/core/trunk/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/project.xml (original)
+++ maven/maven-1/core/trunk/project.xml Mon May 23 23:51:21 2005
@@ -481,12 +481,6 @@
<version>1.6.4</version>
<url>http://ant.apache.org/</url>
</dependency>
-<!-- TODO: can be removed? -->
- <dependency>
- <id>commons-digester</id>
- <version>1.4.1</version>
- <url>http://jakarta.apache.org/commons/digester/</url>
- </dependency>
<dependency>
<id>commons-jelly</id>
<version>1.0-RC2-SNAPSHOT</version>
@@ -530,14 +524,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0</version>
- </dependency>
- <!-- Runtime dependencies -->
-
- <dependency>
- <id>commons-beanutils</id>
- <version>1.6.1</version>
- <url>http://jakarta.apache.org/commons/</url>
+ <version>2.0.2</version>
</dependency>
<dependency>
<id>commons-cli</id>
@@ -545,21 +532,11 @@
<url>http://jakarta.apache.org/commons/cli/</url>
</dependency>
<dependency>
- <id>commons-collections</id>
- <version>2.1</version>
- <url>http://jakarta.apache.org/commons/</url>
- </dependency>
- <dependency>
<id>commons-io</id>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
- <id>commons-lang</id>
- <version>2.0</version>
- <url>http://jakarta.apache.org/commons/lang/</url>
- </dependency>
- <dependency>
<id>forehead</id>
<version>1.0-beta-5</version>
</dependency>
@@ -568,11 +545,13 @@
<version>1.2.8</version>
<url>http://logging.apache.org/log4j/</url>
</dependency>
-
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0-alpha-2</version>
+ <properties>
+ <scope>runtime</scope>
+ </properties>
</dependency>
<dependency>
<groupId>maven</groupId>
@@ -593,6 +572,31 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>1.0-alpha-3</version>
+ </dependency>
+ <!-- Runtime dependencies -->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.6.1</version>
+ <properties>
+ <scope>runtime</scope>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.0</version>
+ <properties>
+ <scope>runtime</scope>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ <properties>
+ <scope>runtime</scope>
+ </properties>
</dependency>
</dependencies>
<build>
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/ArtifactListBuilder.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/ArtifactListBuilder.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/ArtifactListBuilder.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/ArtifactListBuilder.java Mon May 23 23:51:21 2005
@@ -17,11 +17,11 @@
* ====================================================================
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.project.Dependency;
import org.apache.maven.project.Project;
import org.apache.maven.repository.Artifact;
import org.apache.maven.repository.DefaultArtifactFactory;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java Mon May 23 23:51:21 2005
@@ -18,12 +18,10 @@
*/
import com.werken.forehead.ForeheadClassLoader;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.expression.CompositeExpression;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.jelly.JellyUtils;
@@ -31,6 +29,8 @@
import org.apache.maven.project.Project;
import org.apache.tools.ant.DirectoryScanner;
import org.xml.sax.SAXException;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.CollectionUtils;
import javax.xml.parsers.ParserConfigurationException;
import java.beans.IntrospectionException;
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java Mon May 23 23:51:21 2005
@@ -21,7 +21,6 @@
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.MavenConstants;
@@ -29,6 +28,7 @@
import org.apache.maven.jelly.tags.jeez.MavenJeezTagLibrary;
import org.apache.maven.project.Project;
import org.apache.maven.werkz.WerkzProject;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.net.URL;
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginCacheManager.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginCacheManager.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginCacheManager.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginCacheManager.java Mon May 23 23:51:21 2005
@@ -17,11 +17,11 @@
* ====================================================================
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.MavenException;
import org.apache.maven.MavenSession;
+import org.codehaus.plexus.util.StringUtils;
import java.io.*;
import java.util.*;
@@ -240,7 +240,7 @@
/**
* Load on-disk cache information, if possible.
*/
- void loadCache( File directory ) throws IOException
+ void loadCache( File directory )
{
File lockFile = new File( directory, LOCK_CACHE );
checkLockFile( lockFile );
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java Mon May 23 23:51:21 2005
@@ -17,13 +17,13 @@
* ====================================================================
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.MavenException;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.FileInputStream;
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java Mon May 23 23:51:21 2005
@@ -17,42 +17,19 @@
* ====================================================================
*/
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpRecoverableException;
-import org.apache.commons.httpclient.NTCredentials;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.util.DateParseException;
-import org.apache.commons.httpclient.util.DateParser;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.ConnectionException;
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.providers.http.HttpWagon;
+import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.providers.file.FileWagon;
+import org.apache.maven.wagon.providers.http.HttpWagon;
+import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
-import org.apache.maven.MavenConstants;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.net.Authenticator;
-import java.net.HttpURLConnection;
import java.net.PasswordAuthentication;
-import java.net.URL;
-import java.net.URLConnection;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
/**
* Http utils for retrieving files.
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/StringTool.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/util/StringTool.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/StringTool.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/StringTool.java Mon May 23 23:51:21 2005
@@ -17,7 +17,7 @@
* ====================================================================
*/
-import org.apache.commons.lang.StringUtils;
+import org.codehaus.plexus.util.StringUtils;
import java.util.Arrays;
import java.util.List;
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java Mon May 23 23:51:21 2005
@@ -17,31 +17,26 @@
* ====================================================================
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.AbstractMavenComponent;
import org.apache.maven.MavenConstants;
+import org.apache.maven.jelly.MavenJellyContext;
+import org.apache.maven.project.Project;
+import org.apache.maven.repository.Artifact;
import org.apache.maven.util.BootstrapDownloadMeter;
import org.apache.maven.util.ConsoleDownloadMeter;
-import org.apache.maven.jelly.MavenJellyContext;
-import org.apache.maven.wagon.repository.Repository;
-import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.ConnectionException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.events.TransferListener;
-import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.providers.http.HttpWagon;
import org.apache.maven.wagon.providers.file.FileWagon;
-import org.apache.maven.project.Project;
-import org.apache.maven.repository.Artifact;
+import org.apache.maven.wagon.providers.http.HttpWagon;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
-import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java (original)
+++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java Mon May 23 23:51:21 2005
@@ -20,8 +20,8 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.MavenUtils;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.Arrays;
Modified: maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml?rev=178122&r1=178121&r2=178122&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml Mon May 23 23:51:21 2005
@@ -66,6 +66,24 @@
a dependency to their plugin/project, as not all optional tasks are bundled with Maven any more.
</p>
<p>
+ <b>Implicit dependencies on JARs in Maven's <code>lib</code> directory</b>
+ </p>
+ <p>
+ Aside from the XML parsers, the following libraries are no longer distributed with Maven:
+ </p>
+ <ul>
+ <li><code>commons-digester</code></li>
+ <li><code>commons-graph</code></li>
+ <li><code>commons-lang</code></li>
+ <li><code>which</code></li>
+ </ul>
+ <p>
+ If a plugin did not declare a dependency but relied on its existence, it may fail to work under Maven 1.1.
+ </p>
+ <p>
+ In addition, the versions of some libraries have changed, which may affect plugins.
+ </p>
+ <p>
<b>Upgrading <code>maven.jar</code></b>
</p>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org