svn commit: r1214725 - in /maven/wagon/trunk: ./ wagon-provider-api/ wagon-provider-test/ wagon-providers/ wagon-providers/wagon-file/ wagon-providers/wagon-ftp/ wagon-providers/wagon-http-lightweight
Author: olamy Date: Thu Dec 15 12:23:14 2011 New Revision: 1214725 URL: http://svn.apache.org/viewvc?rev=1214725view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/wagon/trunk/pom.xml maven/wagon/trunk/wagon-provider-api/pom.xml maven/wagon/trunk/wagon-provider-test/pom.xml maven/wagon/trunk/wagon-providers/pom.xml maven/wagon/trunk/wagon-providers/wagon-file/pom.xml maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-shared4/pom.xml maven/wagon/trunk/wagon-providers/wagon-http/pom.xml maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml maven/wagon/trunk/wagon-tcks/pom.xml maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml Modified: maven/wagon/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=1214725r1=1214724r2=1214725view=diff == --- maven/wagon/trunk/pom.xml (original) +++ maven/wagon/trunk/pom.xml Thu Dec 15 12:23:14 2011 @@ -29,7 +29,7 @@ under the License. groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId - version2.2/version + version2.3-SNAPSHOT/version packagingpom/packaging nameApache Maven Wagon/name @@ -173,9 +173,9 @@ under the License. /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-2.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/wagon/tags/wagon-2.2/developerConnection -urlhttp://svn.apache.org/viewvc/maven/wagon/tags/wagon-2.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/wagon/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/wagon/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/maven/wagon/trunk/url /scm issueManagement systemjira/system Modified: maven/wagon/trunk/wagon-provider-api/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/pom.xml?rev=1214725r1=1214724r2=1214725view=diff == --- maven/wagon/trunk/wagon-provider-api/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-api/pom.xml Thu Dec 15 12:23:14 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.2/version +version2.3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-provider-test/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/pom.xml?rev=1214725r1=1214724r2=1214725view=diff == --- maven/wagon/trunk/wagon-provider-test/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-test/pom.xml Thu Dec 15 12:23:14 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.2/version +version2.3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/pom.xml?rev=1214725r1=1214724r2=1214725view=diff == --- maven/wagon/trunk/wagon-providers/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/pom.xml Thu Dec 15 12:23:14 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon/artifactId -version2.2/version +version2.3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/wagon-file/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/pom.xml?rev=1214725r1=1214724r2=1214725view=diff == --- maven/wagon/trunk/wagon-providers/wagon-file/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-file/pom.xml Thu Dec 15 12:23:14 2011 @@ -23,7 +23,7 @@ under the License. parent groupIdorg.apache.maven.wagon/groupId artifactIdwagon-providers/artifactId -version2.2/version +version2.3-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml URL:
svn commit: r1214734 - in /maven/site/trunk/src/site/apt: docs/3.0.4/release-notes.apt.vm guides/mini/guide-http-settings.apt
Author: olamy Date: Thu Dec 15 12:46:25 2011 New Revision: 1214734 URL: http://svn.apache.org/viewvc?rev=1214734view=rev Log: fix doc regarding default read time out value Modified: maven/site/trunk/src/site/apt/docs/3.0.4/release-notes.apt.vm maven/site/trunk/src/site/apt/guides/mini/guide-http-settings.apt Modified: maven/site/trunk/src/site/apt/docs/3.0.4/release-notes.apt.vm URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/docs/3.0.4/release-notes.apt.vm?rev=1214734r1=1214733r2=1214734view=diff == --- maven/site/trunk/src/site/apt/docs/3.0.4/release-notes.apt.vm (original) +++ maven/site/trunk/src/site/apt/docs/3.0.4/release-notes.apt.vm Thu Dec 15 12:46:25 2011 @@ -47,7 +47,7 @@ Maven 3.0.4 * default preemptive authentication support. - * a default read timeout configured to 60s. + * a default read timeout configured to 30 minutes. [] Modified: maven/site/trunk/src/site/apt/guides/mini/guide-http-settings.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-http-settings.apt?rev=1214734r1=1214733r2=1214734view=diff == --- maven/site/trunk/src/site/apt/guides/mini/guide-http-settings.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-http-settings.apt Thu Dec 15 12:46:25 2011 @@ -394,7 +394,7 @@ problems with HTTP servers and proxies t ** Read time out - With Wagon 2.0 and Apache Maven 3.0.4, a default timeout of 60s comes by default. + With Wagon 2.0 and Apache Maven 3.0.4, a default timeout of 30 minutes comes by default. If you want to change this value, you can add the following setup in your settings: +---+
svn commit: r1214956 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Author: dennisl Date: Thu Dec 15 20:59:21 2011 New Revision: 1214956 URL: http://svn.apache.org/viewvc?rev=1214956view=rev Log: [MASSEMBLY-548] Improve documentation for filters parameter Submitted by: Anders Hammar Reviewed by: Dennis Lundberg Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1214956r1=1214955r2=1214956view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Thu Dec 15 20:59:21 2011 @@ -302,6 +302,13 @@ public abstract class AbstractAssemblyMo private MavenArchiveConfiguration archive; /** + * The list of extra filter properties files to be used along with System properties, project + * properties, and filter properties files specified in the POM build/filters section, which + * should be used for the filtering during the current mojo execution. + * br/ + * Normally, these will be configured from a plugin's execution section, to provide a different + * set of filters for a particular execution. + * * @parameter */ protected ListString filters;
svn commit: r1214960 - in /maven/shared/trunk/maven-doxia-tools/src: main/java/org/apache/maven/doxia/tools/ test/java/org/apache/maven/doxia/tools/ test/resources/unit/interpolation-child-test/ test/
Author: rfscholte
Date: Thu Dec 15 21:22:49 2011
New Revision: 1214960
URL: http://svn.apache.org/viewvc?rev=1214960view=rev
Log:
revert changes of rev 1214470, some parts of site.xml inheritence must be
interpolated immediately, other parts at the end. Requires another approach.
Removed:
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-child-test/
maven/shared/trunk/maven-doxia-tools/src/test/resources/unit/interpolation-parent-test/
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1214960r1=1214959r2=1214960view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Thu Dec 15 21:22:49 2011
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
@@ -55,7 +54,6 @@ import org.apache.maven.doxia.site.decor
import org.apache.maven.doxia.site.decoration.Skin;
import
org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
-import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Site;
@@ -461,9 +459,10 @@ public class DefaultSiteTool
getDecorationModel( project, parentProject, reactorProjects,
localRepository, repositories, siteDirectory,
llocale, props, inputEncoding, outputEncoding
);
-String siteDescriptorContent;
if ( decorationModel == null )
{
+String siteDescriptorContent;
+
try
{
// Note the default is not a super class - it is used when
nothing else is found
@@ -474,24 +473,12 @@ public class DefaultSiteTool
{
throw new SiteToolException( Error reading default site
descriptor: + e.getMessage(), e );
}
+
+siteDescriptorContent = getInterpolatedSiteDescriptorContent(
props, project, siteDescriptorContent,
+
inputEncoding, outputEncoding );
+
+decorationModel = readDecorationModel( siteDescriptorContent );
}
-else
-{
-try
-{
-StringWriter writer = new StringWriter();
-new DecorationXpp3Writer().write( writer, decorationModel );
-siteDescriptorContent = writer.toString();
-}
-catch ( IOException e )
-{
-throw new SiteToolException( The site descriptor cannot be
parsed!, e );
-}
-}
-
-siteDescriptorContent = getInterpolatedSiteDescriptorContent( props,
project, siteDescriptorContent,
-
inputEncoding, outputEncoding );
-decorationModel = readDecorationModel( siteDescriptorContent );
if ( parentProject != null )
{
@@ -1173,15 +1160,16 @@ public class DefaultSiteTool
siteDescriptor = getSiteDescriptorFromBasedir( siteDirectory,
project.getBasedir(), locale );
}
-DecorationModel decoration = null;
+String siteDescriptorContent = null;
+long siteDescriptorLastModified = 0L;
try
{
if ( siteDescriptor != null siteDescriptor.exists() )
{
getLogger().debug( Reading site descriptor from +
siteDescriptor );
Reader siteDescriptorReader = ReaderFactory.newXmlReader(
siteDescriptor );
-decoration = readDecorationModel( siteDescriptorReader );
-decoration.setLastModified( siteDescriptor.lastModified() );
+siteDescriptorContent = IOUtil.toString( siteDescriptorReader
);
+siteDescriptorLastModified = siteDescriptor.lastModified();
}
}
catch ( IOException e )
@@ -1189,6 +1177,16 @@ public class DefaultSiteTool
throw new SiteToolException( The site descriptor cannot be
read!, e );
}
+DecorationModel decoration
