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 2004/09/24 12:38:46 UTC
cvs commit: maven/xdocs/start integrate.xml release-notes-rc2.xml release-notes-rc3.xml release-notes-rc4.xml
brett 2004/09/24 03:38:46
Modified: src/bin Tag: MAVEN-1_0-BRANCH maven
src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
ArtifactListBuilder.java
src/java/org/apache/maven/cli Tag: MAVEN-1_0-BRANCH App.java
src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
src/java/org/apache/maven/repository Tag: MAVEN-1_0-BRANCH
AbstractArtifact.java Artifact.java
src/java/org/apache/maven/verifier Tag: MAVEN-1_0-BRANCH
DependencyVerifier.java
src/test/touchstone-build Tag: MAVEN-1_0-BRANCH maven.xml
project.properties project.xml
src/test/touchstone-build/src/reactor-build/default Tag:
MAVEN-1_0-BRANCH maven.xml
src/test/touchstone-build/src/reactor-build/default/subproject
Tag: MAVEN-1_0-BRANCH maven.xml
xdocs Tag: MAVEN-1_0-BRANCH changes.xml
xdocs/reference Tag: MAVEN-1_0-BRANCH project-descriptor.xml
user-guide.xml
xdocs/start Tag: MAVEN-1_0-BRANCH integrate.xml
Removed: xdocs/start Tag: MAVEN-1_0-BRANCH release-notes-rc2.xml
release-notes-rc3.xml release-notes-rc4.xml
Log:
swag of bugfixes - refer to changelog
Revision Changes Path
No revision
No revision
1.31.4.8 +5 -1 maven/src/bin/maven
Index: maven
===================================================================
RCS file: /home/cvs/maven/src/bin/maven,v
retrieving revision 1.31.4.7
retrieving revision 1.31.4.8
diff -u -r1.31.4.7 -r1.31.4.8
--- maven 6 Jul 2004 14:29:46 -0000 1.31.4.7
+++ maven 24 Sep 2004 10:38:42 -0000 1.31.4.8
@@ -24,6 +24,10 @@
MAVEN_OPTS="-Xmx256m"
fi
+if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+fi
+
if [ -f "$HOME/.mavenrc" ] ; then
. "$HOME/.mavenrc"
fi
@@ -109,7 +113,7 @@
if [ ! -x "$JAVACMD" ] ; then
echo "Error: JAVA_HOME is not defined correctly."
echo " We cannot execute $JAVACMD"
- exit
+ exit 1
fi
if [ -z "$JAVA_HOME" ] ; then
No revision
No revision
1.14.4.3 +3 -1 maven/src/java/org/apache/maven/ArtifactListBuilder.java
Index: ArtifactListBuilder.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/ArtifactListBuilder.java,v
retrieving revision 1.14.4.2
retrieving revision 1.14.4.3
diff -u -r1.14.4.2 -r1.14.4.3
--- ArtifactListBuilder.java 1 Mar 2004 22:36:35 -0000 1.14.4.2
+++ ArtifactListBuilder.java 24 Sep 2004 10:38:43 -0000 1.14.4.3
@@ -69,12 +69,14 @@
// be used.
d.setVersion( mavenJarProperty );
artifact.setPath( project.getContext().getMavenRepoLocal() + artifact.generatePath() );
+ artifact.setOverrideType( Artifact.OVERRIDE_VERSION );
}
else
{
// User is requesting a specific path to a dependency
// be used.
artifact.setPath( new File( mavenJarProperty ).getAbsolutePath() );
+ artifact.setOverrideType( Artifact.OVERRIDE_PATH );
}
}
else
No revision
No revision
1.37.4.26 +16 -8 maven/src/java/org/apache/maven/cli/App.java
Index: App.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/cli/App.java,v
retrieving revision 1.37.4.25
retrieving revision 1.37.4.26
diff -u -r1.37.4.25 -r1.37.4.26
--- App.java 26 Jun 2004 14:52:06 -0000 1.37.4.25
+++ App.java 24 Sep 2004 10:38:43 -0000 1.37.4.26
@@ -18,6 +18,7 @@
*/
import com.werken.werkz.NoActionDefinitionException;
+import com.werken.werkz.NoSuchGoalException;
import com.werken.werkz.UnattainableGoalException;
import org.apache.commons.cli.CommandLine;
@@ -496,6 +497,7 @@
{
failed = true;
System.err.println( e.getLocalizedMessage() );
+ returnCode = RC_FAILED_DEPENDENCY;
}
catch ( UnknownGoalException e )
{
@@ -505,6 +507,14 @@
+ "\" does not exist in this project." );
returnCode = RC_NO_GOAL;
}
+ catch ( NoSuchGoalException e )
+ {
+ failed = true;
+ System.err.println( "BUILD FAILED" );
+ System.err.println( e.getMessage() );
+ System.err.println( "A plugin has attempted to use a goal that does not exist" );
+ returnCode = RC_NO_GOAL;
+ }
catch ( NoGoalException e )
{
failed = true;
@@ -627,7 +637,6 @@
{
log.info( "" );
exit( returnCode );
- return;
}
}
@@ -642,7 +651,6 @@
CLIManager.displayHelp();
log.info( "" );
exit( RC_OK );
- return;
}
}
@@ -667,7 +675,6 @@
}
exit( RC_OK );
- return;
}
}
@@ -706,10 +713,13 @@
displayGoals( false, null, goals );
- log.info( wrapConsoleMessage( mavenSession.getRootProject().getDescription(), 0, CONSOLE_WIDTH ) );
+ String msg = mavenSession.getRootProject().getDescription();
+ if ( msg != null )
+ {
+ log.info( wrapConsoleMessage( msg, 0, CONSOLE_WIDTH ) );
+ }
exit( RC_OK );
- return;
}
}
@@ -739,7 +749,6 @@
}
log.info( "Home Build properties: " + buildProperties );
exit( RC_OK );
- return;
}
}
@@ -752,7 +761,6 @@
{
printConsoleMavenHeader();
exit( RC_OK );
- return;
}
}
No revision
No revision
1.70.4.54 +15 -3 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.53
retrieving revision 1.70.4.54
diff -u -r1.70.4.53 -r1.70.4.54
--- PluginManager.java 22 Sep 2004 11:14:47 -0000 1.70.4.53
+++ PluginManager.java 24 Sep 2004 10:38:43 -0000 1.70.4.54
@@ -19,6 +19,7 @@
import com.werken.forehead.Forehead;
import com.werken.forehead.ForeheadClassLoader;
+import com.werken.werkz.Goal;
import com.werken.werkz.NoSuchGoalException;
import com.werken.werkz.Session;
import com.werken.werkz.WerkzProject;
@@ -639,7 +640,12 @@
log.debug( "attaining goal " + goalName );
try
{
- werkzProject.attainGoal( goalName, session );
+ Goal goal = werkzProject.getGoal( goalName );
+ if ( goal == null || goal.getAction() == null )
+ {
+ throw new NoSuchGoalException( goalName );
+ }
+ goal.attain( session );
}
catch ( NoSuchGoalException e )
{
@@ -930,7 +936,8 @@
File unzipDir = new File( unpackedPluginsDir, pluginName );
// if there's no directory, or the jar is newer, expand the jar
- if ( !unzipDir.exists() || ( jarFile.lastModified() > unzipDir.lastModified() ) )
+ boolean exists = unzipDir.exists();
+ if ( !exists || ( jarFile.lastModified() > unzipDir.lastModified() ) )
{
if ( log.isDebugEnabled() )
{
@@ -939,6 +946,11 @@
try
{
+ if ( exists )
+ {
+ FileUtils.deleteDirectory( unzipDir );
+ }
+
Expand unzipper = new Expand();
unzipper.setSrc( jarFile );
unzipper.setDest( unzipDir );
No revision
No revision
1.22.4.6 +16 -2 maven/src/java/org/apache/maven/repository/AbstractArtifact.java
Index: AbstractArtifact.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/repository/AbstractArtifact.java,v
retrieving revision 1.22.4.5
retrieving revision 1.22.4.6
diff -u -r1.22.4.5 -r1.22.4.6
--- AbstractArtifact.java 6 Jun 2004 03:06:45 -0000 1.22.4.5
+++ AbstractArtifact.java 24 Sep 2004 10:38:43 -0000 1.22.4.6
@@ -49,6 +49,9 @@
/** Path to artifact. */
private String path;
+ /** Override type. */
+ private String overrideType = OVERRIDE_NONE;
+
/**
* Default constructor.
* @param dependency the dependency the artifact is based on
@@ -128,7 +131,8 @@
/** @see Artifact#isSnapshot */
public boolean isSnapshot()
{
- return getDependency().getArtifact().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0;
+ return getDependency().getVersion().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0 ||
+ getDependency().getArtifact().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0;
}
/** @see Artifact#getFile */
@@ -180,5 +184,15 @@
throw new ChecksumVerificationException(
MavenUtils.getMessage( "checksum.verification.error", getPath() ) );
}
+ }
+
+ public String getOverrideType()
+ {
+ return overrideType;
+ }
+
+ public void setOverrideType( String overrideType )
+ {
+ this.overrideType = overrideType;
}
}
1.18.10.3 +10 -2 maven/src/java/org/apache/maven/repository/Artifact.java
Index: Artifact.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/repository/Artifact.java,v
retrieving revision 1.18.10.2
retrieving revision 1.18.10.3
diff -u -r1.18.10.2 -r1.18.10.3
--- Artifact.java 1 Mar 2004 22:36:39 -0000 1.18.10.2
+++ Artifact.java 24 Sep 2004 10:38:43 -0000 1.18.10.3
@@ -31,7 +31,11 @@
*/
public interface Artifact
{
- /**
+ public static final String OVERRIDE_NONE = null;
+ public static final String OVERRIDE_VERSION = "version";
+ public static final String OVERRIDE_PATH = "path";
+
+ /**
* Set the dependency for this JAR artifact.
*
* @param dependency Dependency this artifact is based on.
@@ -118,4 +122,8 @@
*/
void verify()
throws ChecksumVerificationException;
+
+ public void setOverrideType( String overrideType );
+ public String getOverrideType();
}
+
No revision
No revision
1.34.4.10 +15 -1 maven/src/java/org/apache/maven/verifier/DependencyVerifier.java
Index: DependencyVerifier.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/verifier/DependencyVerifier.java,v
retrieving revision 1.34.4.9
retrieving revision 1.34.4.10
diff -u -r1.34.4.9 -r1.34.4.10
--- DependencyVerifier.java 6 Jul 2004 12:45:48 -0000 1.34.4.9
+++ DependencyVerifier.java 24 Sep 2004 10:38:44 -0000 1.34.4.10
@@ -206,6 +206,20 @@
{
Artifact artifact = (Artifact) i.next();
message.append( artifact.getName() );
+
+ String overrideType = artifact.getOverrideType();
+ if ( overrideType != Artifact.OVERRIDE_NONE )
+ {
+ if ( overrideType.equals( Artifact.OVERRIDE_VERSION ) )
+ {
+ message.append( "; version override doesn't exist: " + artifact.getDependency().getVersion() );
+ }
+ else if ( overrideType.equals( Artifact.OVERRIDE_PATH ) )
+ {
+ message.append( "; path override doesn't exist: " + artifact.getPath() );
+ }
+ }
+
String url = artifact.getDependency().getUrl();
if (StringUtils.isNotEmpty(url))
{
No revision
No revision
1.43.4.21 +10 -3 maven/src/test/touchstone-build/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/maven.xml,v
retrieving revision 1.43.4.20
retrieving revision 1.43.4.21
diff -u -r1.43.4.20 -r1.43.4.21
--- maven.xml 7 Jul 2004 10:25:30 -0000 1.43.4.20
+++ maven.xml 24 Sep 2004 10:38:44 -0000 1.43.4.21
@@ -778,6 +778,8 @@
</goal>
<goal name="test-defaults">
+ <j:remove var="ranDefault" />
+
<maven:maven
descriptor="${basedir}/src/reactor-build/default/subproject/project.xml"
goals=""
@@ -845,19 +847,24 @@
</goal>
<goal name="test-plugin-loading" prereqs="xdoc:init">
+ <!-- test prereq -->
<maven:get plugin="maven-xdoc-plugin" property="maven.xdoc.theme" var="d" />
<j:if test="${d != 'theme'}">
<fail>maven.xdoc.theme in xdoc plugin is not 'theme', is '${d}'</fail>
</j:if>
+ <!-- test handle -->
<multiproject:dependency-handle />
<maven:get plugin="maven-multiproject-plugin" property="maven.multiproject.includes" var="d" />
<j:if test="${d != '*/project.xml'}">
<fail>maven.multiproject.includes in multiproject plugin is not '*/project.xml', is '${d}'</fail>
</j:if>
- <maven:get plugin="maven-dist-plugin" property="maven.dist.tar.executable" var="d" />
- <j:if test="${d != 'tar'}">
- <fail>maven.dist.tar.executable in dist plugin is not 'tar', is '${d}'</fail>
+ <!-- test get -->
+ <maven:get plugin="maven-multichanges-plugin" property="maven.multichanges.report" var="d" />
+ <j:if test="${d != 'multichanges-report'}">
+ <fail>maven.dist.bin.artifact in dist plugin is not 'multichanges-report', is '${d}'</fail>
</j:if>
+
+ <!-- test set -->
<maven:set plugin="maven-javadoc-plugin" property="maven.javadoc.debug" value="foo" />
<maven:get plugin="maven-javadoc-plugin" property="maven.javadoc.debug" var="d" />
<j:if test="${d != 'foo'}">
1.8.10.2 +2 -0 maven/src/test/touchstone-build/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/project.properties,v
retrieving revision 1.8.10.1
retrieving revision 1.8.10.2
diff -u -r1.8.10.1 -r1.8.10.2
--- project.properties 4 Mar 2004 17:47:00 -0000 1.8.10.1
+++ project.properties 24 Sep 2004 10:38:44 -0000 1.8.10.2
@@ -45,4 +45,6 @@
maven.touchstone.A = override.maven.touchstone.A
+maven.jar.maven = ${maven.home}/lib/maven.jar
+
maven.username=maven
1.34.4.5 +1 -2 maven/src/test/touchstone-build/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/project.xml,v
retrieving revision 1.34.4.4
retrieving revision 1.34.4.5
diff -u -r1.34.4.4 -r1.34.4.5
--- project.xml 23 Mar 2004 23:49:31 -0000 1.34.4.4
+++ project.xml 24 Sep 2004 10:38:44 -0000 1.34.4.5
@@ -55,8 +55,7 @@
</dependency>
<dependency>
<id>maven</id>
- <version>beta-8</version>
- <jar>maven.jar</jar>
+ <version>1.0</version>
</dependency>
<!--
|
No revision
No revision
1.1.2.4 +1 -0 maven/src/test/touchstone-build/src/reactor-build/default/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/src/reactor-build/default/maven.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- maven.xml 2 Apr 2004 23:43:09 -0000 1.1.2.3
+++ maven.xml 24 Sep 2004 10:38:44 -0000 1.1.2.4
@@ -21,6 +21,7 @@
xmlns:j="jelly:core">
<goal name="base-default">
+ <echo>Setting ranDefault into ${context.parent}</echo>
<j:set var="ranDefault" value="base-default" scope="parent" />
</goal>
No revision
No revision
1.1.2.3 +1 -0 maven/src/test/touchstone-build/src/reactor-build/default/subproject/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/src/reactor-build/default/subproject/maven.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- maven.xml 4 Mar 2004 17:47:00 -0000 1.1.2.2
+++ maven.xml 24 Sep 2004 10:38:45 -0000 1.1.2.3
@@ -21,6 +21,7 @@
xmlns:j="jelly:core">
<goal name="subproject-default">
+ <echo>Setting ranDefault into ${context.parent}</echo>
<j:set var="ranDefault" value="subproject-default" scope="parent" />
</goal>
No revision
No revision
1.14.4.36 +13 -0 maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/changes.xml,v
retrieving revision 1.14.4.35
retrieving revision 1.14.4.36
diff -u -r1.14.4.35 -r1.14.4.36
--- changes.xml 22 Sep 2004 11:14:47 -0000 1.14.4.35
+++ changes.xml 24 Sep 2004 10:38:45 -0000 1.14.4.36
@@ -25,6 +25,19 @@
</properties>
<body>
<release version="1.0.1-SNAPSHOT" date="in CVS MAVEN-1_0-BRANCH">
+ <action dev="brett" type="fix" issue="MAVEN-109">Cleaned up exits in App, verified that all error paths return an error code.</action>
+ <action dev="brett" type="fix" issue="MAVEN-581">Improve error message for missing overridden dependencies</action>
+ <action dev="brett" type="fix" issue="MAVEN-880">Updated documentation for project descriptor.</action>
+ <action dev="brett" type="add" issue="MAVEN-1139">Add a global shell configuration file for unix, /etc/mavenrc</action>
+ <action dev="brett" type="fix" issue="MAVEN-1208">Make example POM in documentation validate according to strict XSD</action>
+ <action dev="brett" type="fix" issue="MAVEN-1358">Make touchstone test-defaults run no matter what the previous state.</action>
+ <action dev="brett" type="fix" issue="MAVEN-1323">Don't execute preGoals for a goal that doesn't exist: return an error</action>
+ <action dev="brett" type="fix" issue="MAVEN-1335">Add reference to the project descriptor from the user guide.</action>
+ <action dev="brett" type="fix" issue="MAVEN-1362">Change plugin variable used in touchstone test as it is commonly overwritted.</action>
+ <action dev="brett" type="fix" issue="MAVEN-1373">Don't cause an exception when maven -u run on a directory with no project.</action>
+ <action dev="brett" type="fix" issue="MAVEN-1383" due-to="Ben Walding">Exit with error code is JAVA_HOME not defined</action>
+ <action dev="brett" type="fix" issue="MAVEN-1387">Treat dependency with SNAPSHOT versions as a snapshot, even if the filename does not include it</action>
+ <action dev="brett" type="fix" issue="MAVEN-1431">Delete plugin cache directory before expanding to ensure it is clean, and so that after the extraction the timestamp is newer than the JAR file to avoid being repeatedly extracted.</action>
<action dev="brett" type="fix" issue="MAVEN-1433">Show filename in error when Jelly can't parse XML</action>
<action dev="dion" type="add" issue="MAVEN-1382">Add license report to web site</action>
</release>
No revision
No revision
1.29.2.8 +7 -5 maven/xdocs/reference/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/reference/project-descriptor.xml,v
retrieving revision 1.29.2.7
retrieving revision 1.29.2.8
diff -u -r1.29.2.7 -r1.29.2.8
--- project-descriptor.xml 13 Jul 2004 12:08:50 -0000 1.29.2.7
+++ project-descriptor.xml 24 Sep 2004 10:38:46 -0000 1.29.2.8
@@ -307,11 +307,13 @@
<tr>
<td><a name="description">description</a></td>
<td>
- Optional. A detailed description of the project. This element is
- usually specified as CDATA to enable the use of HTML tags
- within the description. This description is used to
- generate the <a href="plugins/site/index.html">front page</a>
- of the project's web site.
+ Optional. A detailed description of the project.
+ This description is used as the default to generate the
+ <a href="plugins/site/index.html">front page</a> of the project's web site, and is
+ shown when <code>maven --usage</code> is called on the project.
+ While this element can be specified as CDATA to enable the use of HTML tags
+ within the description, you are encouraged to provide an alternative home page using
+ <code>xdocs/index.xml</code> if this is required.
</td>
</tr>
<tr>
1.63.4.12 +4 -0 maven/xdocs/reference/user-guide.xml
Index: user-guide.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/reference/user-guide.xml,v
retrieving revision 1.63.4.11
retrieving revision 1.63.4.12
diff -u -r1.63.4.11 -r1.63.4.12
--- user-guide.xml 23 Jul 2004 06:22:38 -0000 1.63.4.11
+++ user-guide.xml 24 Sep 2004 10:38:46 -0000 1.63.4.12
@@ -143,6 +143,10 @@
source cross-references and anything else that may be provided by a
Maven plug-in are all controlled by your POM.
</p>
+ <p>
+ For a complete reference of the project file, see <a href="project-descriptor.html">the
+ project descriptor</a>.
+ </p>
</section>
<section name="POM Processing">
No revision
No revision
1.24.2.2 +4 -10 maven/xdocs/start/integrate.xml
Index: integrate.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/start/integrate.xml,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- integrate.xml 4 Mar 2004 17:45:58 -0000 1.24.2.1
+++ integrate.xml 24 Sep 2004 10:38:46 -0000 1.24.2.2
@@ -69,9 +69,9 @@
<source><![CDATA[<?xml version="1.0"?>
<project>
<pomVersion>3</pomVersion>
- <name>maven</name>
<id>maven</id>
- <currentVersion>1.0-b4-dev</currentVersion>
+ <name>maven</name>
+ <currentVersion>1.0-SNAPSHOT</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
@@ -79,8 +79,6 @@
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
- <shortDescription>Java Project Management Tools</shortDescription>
-
<!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
@@ -94,6 +92,8 @@
source repository, and source cross-references.
</description>
+ <shortDescription>Java Project Management Tools</shortDescription>
+
<url>http://maven.apache.org/</url>
<issueTrackingUrl>
http://nagoya.apache.org/scarab/servlet/scarab/
@@ -251,12 +251,6 @@
</includes>
</resource>
</resources>
-
- <!-- Integration unit test cases -->
- <integrationUnitTest/>
-
- <jars>
- </jars>
</build>
</project>]]></source>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org