Author: bentmann
Date: Sat Dec 5 19:43:54 2009
New Revision: 887583
URL: http://svn.apache.org/viewvc?rev=887583&view=rev
Log:
[MASSEMBLY-452] Shared Assembly Descriptor does not work in Maven3-alpha4
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/empty.xml (with
props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/goals.txt?rev=887583&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/goals.txt
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/goals.txt
Sat Dec 5 19:43:54 2009
@@ -0,0 +1 @@
+clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/goals.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/pom.xml?rev=887583&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/pom.xml
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/pom.xml
Sat Dec 5 19:43:54 2009
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>org.test</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+
+ <name>Test</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/classpath-descriptor/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java?rev=887583&r1=887582&r2=887583&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java
Sat Dec 5 19:43:54 2009
@@ -39,12 +39,12 @@
private String formatPrefix( String prefix )
{
- if ( !prefix.startsWith( "/" ) )
+ if ( prefix.startsWith( "/" ) )
{
- prefix = "/" + prefix;
+ prefix = prefix.substring( 1 );
}
- if ( !prefix.endsWith( "/" ) )
+ if ( prefix.length() > 0 && !prefix.endsWith( "/" ) )
{
prefix += "/";
}
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java?rev=887583&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java
Sat Dec 5 19:43:54 2009
@@ -0,0 +1,80 @@
+package org.apache.maven.plugin.assembly.io;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.shared.io.location.Location;
+import org.apache.maven.shared.io.location.LocatorStrategy;
+import org.apache.maven.shared.io.logging.DefaultMessageHolder;
+import org.apache.maven.shared.io.logging.MessageHolder;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Benjamin Bentmann
+ */
+public class PrefixedClasspathLocatorStrategyTest
+ extends TestCase
+{
+
+ public void testResolvePrefixWithLeadingSlashAndWithTrailingSlash()
+ {
+ MessageHolder mh = new DefaultMessageHolder();
+
+ LocatorStrategy ls = new PrefixedClasspathLocatorStrategy( "/assemblies/" );
+ Location location = ls.resolve( "empty.xml", mh );
+
+ assertNotNull( location );
+ assertEquals( 0, mh.size() );
+ }
+
+ public void testResolvePrefixWithLeadingSlashAndWithoutTrailingSlash()
+ {
+ MessageHolder mh = new DefaultMessageHolder();
+
+ LocatorStrategy ls = new PrefixedClasspathLocatorStrategy( "/assemblies" );
+ Location location = ls.resolve( "empty.xml", mh );
+
+ assertNotNull( location );
+ assertEquals( 0, mh.size() );
+ }
+
+ public void testResolvePrefixWithoutLeadingSlashAndWithTrailingSlash()
+ {
+ MessageHolder mh = new DefaultMessageHolder();
+
+ LocatorStrategy ls = new PrefixedClasspathLocatorStrategy( "assemblies/" );
+ Location location = ls.resolve( "empty.xml", mh );
+
+ assertNotNull( location );
+ assertEquals( 0, mh.size() );
+ }
+
+ public void testResolvePrefixWithoutLeadingSlashAndWithoutTrailingSlash()
+ {
+ MessageHolder mh = new DefaultMessageHolder();
+
+ LocatorStrategy ls = new PrefixedClasspathLocatorStrategy( "assemblies" );
+ Location location = ls.resolve( "empty.xml", mh );
+
+ assertNotNull( location );
+ assertEquals( 0, mh.size() );
+ }
+
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/empty.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/empty.xml?rev=887583&view=auto
==============================================================================
(empty)
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/empty.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/empty.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Author: bentmann
Date: Sat Dec 5 19:42:28 2009
New Revision: 887582
URL: http://svn.apache.org/viewvc?rev=887582&view=rev
Log:
o Restored Java 1.4 compat and fixed locale-dependency
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java?rev=887582&r1=887581&r2=887582&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
Sat Dec 5 19:42:28 2009
@@ -31,6 +31,7 @@
import java.io.IOException;
import java.io.Reader;
import java.util.Collections;
+import java.util.Locale;
/**
* @version $Id$
@@ -81,7 +82,7 @@
File target = FileUtils.createTempFile( source.getName() + ".", ".filtered",
tempRoot );
//@todo this test can be improved
- boolean isPropertiesFile = source.getName().toLowerCase().contains( ".properties"
);
+ boolean isPropertiesFile = source.getName().toLowerCase( Locale.ENGLISH ).endsWith(
".properties" );
configSource.getMavenFileFilter().copyFile( source, target, true, configSource.getProject(),
Collections.EMPTY_LIST, isPropertiesFile, null, configSource.getMavenSession()
);
Author: bentmann
Date: Sat Dec 5 19:41:46 2009
New Revision: 887581
URL: http://svn.apache.org/viewvc?rev=887581&view=rev
Log:
o Polished POM
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=887581&r1=887580&r2=887581&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat Dec 5 19:41:46 2009
@@ -325,7 +325,7 @@
<test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
<it.pomIncludes>**/pom.xml</it.pomIncludes>
<it.streamLogs>false</it.streamLogs>
- <testVersion>${pom.version}</testVersion>
+ <testVersion>${project.version}</testVersion>
</properties>
<build>
Author: pgier
Date: Sat Dec 5 18:23:03 2009
New Revision: 887568
URL: http://svn.apache.org/viewvc?rev=887568&view=rev
Log:
Remove the ant tasks download links from the main Maven download page. There is now a separate
download page within the Ant tasks site.
Modified:
maven/site/trunk/src/site/apt/download.apt.vm
Modified: maven/site/trunk/src/site/apt/download.apt.vm
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/download.apt.vm?rev=887568&r1=887567&r2=887568&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/download.apt.vm (original)
+++ maven/site/trunk/src/site/apt/download.apt.vm Sat Dec 5 18:23:03 2009
@@ -101,20 +101,6 @@
[]
-* {Maven Ant Tasks}
-
- Detailed information about the Maven Ant tasks can be found on the {{{http://maven.apache.org/ant-tasks}project
site}}.
-
-*-------------------------+---------+----------+-----------+
-| | Mirrors | Checksum | Signature |
-*-------------------------+---------+----------+-----------+
-| Maven Ant Tasks 2.0.10 | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-ant-tasks-2.0.10.jar}
maven-ant-tasks-2.0.10.jar}} | {{{http://www.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.10.jar.md5}
maven-ant-tasks-2.0.10.jar.md5}} | {{{http://www.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.10.jar.asc}
maven-ant-tasks-2.0.10.jar.asc}} |
-*-------------------------+---------+----------+-----------+
-| Sources (zip) | {{{http://www.apache.org/dyn/closer.cgi/maven/source/maven-ant-tasks-2.0.10-src.zip}
maven-ant-tasks-2.0.10-src.zip}} | {{{http://www.apache.org/dist/maven/source/maven-ant-tasks-2.0.10-src.zip.md5}
maven-ant-tasks-2.0.10-src.zip.md5}} | {{{http://www.apache.org/dist/maven/source/maven-ant-tasks-2.0.10-src.zip.asc}
maven-ant-tasks-2.0.10-src.zip.asc}} |
-*-------------------------+---------+----------+-----------+
-| Sources (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi?path=/maven/source/maven-ant-tasks-2.0.10-src.tar.gz}
maven-ant-tasks-2.0.10-src.tar.gz}} | {{{http://www.apache.org/dist/maven/source/maven-ant-tasks-2.0.10-src.tar.gz.md5}
maven-ant-tasks-2.0.10-src.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/source/maven-ant-tasks-2.0.10-src.tar.gz.asc}
maven-ant-tasks-2.0.10-src.tar.gz.asc}} |
-*-------------------------+---------+----------+-----------+
-
* Previous Releases
All previous releases of Maven can be found in the {{{http://archive.apache.org/dist/maven/binaries/}archives}}.
Author: bentmann
Date: Fri Dec 4 21:36:51 2009
New Revision: 887367
URL: http://svn.apache.org/viewvc?rev=887367&view=rev
Log:
[MNG-4482] [regression] command line option "-update-snapshots" does not work for plugins/extensions
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=887367&r1=887366&r2=887367&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Fri Dec 4 21:36:51 2009
@@ -960,6 +960,7 @@
request.setRemoteRepositories( project.getPluginArtifactRepositories() );
}
request.setOffline( session.isOffline() );
+ request.setForceUpdate( session.getRequest().isUpdateSnapshots() );
request.setTransferListener( session.getRequest().getTransferListener() );
return request;
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java?rev=887367&r1=887366&r2=887367&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
Fri Dec 4 21:36:51 2009
@@ -44,17 +44,22 @@
private final List<File> files;
+ private final List<String> ids;
+
private final int hashCode;
public CacheKey( List<? extends Artifact> extensionArtifacts )
{
this.files = new ArrayList<File>( extensionArtifacts.size() );
+ this.ids = new ArrayList<String>( extensionArtifacts.size() );
+
for ( Artifact artifact : extensionArtifacts )
{
files.add( artifact.getFile() );
+ ids.add( artifact.getVersion() );
}
- this.hashCode = files.hashCode();
+ this.hashCode = files.hashCode() * 31 + ids.hashCode();
}
@Override
@@ -78,7 +83,7 @@
CacheKey other = (CacheKey) o;
- return files.equals( other.files );
+ return files.equals( other.files ) && ids.equals( other.ids );
}
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java?rev=887367&r1=887366&r2=887367&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
Fri Dec 4 21:36:51 2009
@@ -21,11 +21,13 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -144,7 +146,7 @@
hash = hash * 31 + groupId.hashCode();
hash = hash * 31 + artifactId.hashCode();
hash = hash * 31 + version.hashCode();
- hash = hash * 31 + repositories.hashCode();
+ hash = hash * 31 + repositoriesHashCode( repositories );
this.hashCode = hash;
}
@@ -170,7 +172,7 @@
CacheKey that = (CacheKey) obj;
return this.artifactId.equals( that.artifactId ) && this.groupId.equals(
that.groupId )
- && this.version.equals( that.version ) && this.repositories.equals(
that.repositories );
+ && this.version.equals( that.version ) && repositoriesEquals(
this.repositories, that.repositories );
}
@Override
@@ -179,6 +181,68 @@
return groupId + ':' + artifactId + ':' + version;
}
+ private static int repositoryHashCode( ArtifactRepository repository )
+ {
+ int result = 17;
+ result = 31 * result + ( repository.getId() != null ? repository.getId().hashCode()
: 0 );
+ return result;
+ }
+
+ private static int repositoriesHashCode( List<ArtifactRepository> repositories
)
+ {
+ int result = 17;
+ for ( ArtifactRepository repository : repositories )
+ {
+ result = 31 * result + repositoryHashCode( repository );
+ }
+ return result;
+ }
+
+ private static boolean repositoryEquals( ArtifactRepository r1, ArtifactRepository
r2 )
+ {
+ if ( r1 == r2 )
+ {
+ return true;
+ }
+
+ return eq( r1.getId(), r2.getId() ) && eq( r1.getUrl(), r2.getUrl() )
+ && repositoryPolicyEquals( r1.getReleases(), r2.getReleases() )
+ && repositoryPolicyEquals( r1.getSnapshots(), r2.getSnapshots() );
+ }
+
+ private static boolean repositoryPolicyEquals( ArtifactRepositoryPolicy p1, ArtifactRepositoryPolicy
p2 )
+ {
+ if ( p1 == p2 )
+ {
+ return true;
+ }
+
+ return p1.isEnabled() == p2.isEnabled() && eq( p1.getUpdatePolicy(),
p2.getUpdatePolicy() );
+ }
+
+ private static boolean repositoriesEquals( List<ArtifactRepository> r1, List<ArtifactRepository>
r2 )
+ {
+ if ( r1.size() != r2.size() )
+ {
+ return false;
+ }
+
+ for ( Iterator<ArtifactRepository> it1 = r1.iterator(), it2 = r2.iterator();
it1.hasNext(); )
+ {
+ if ( !repositoryEquals( it1.next(), it2.next() ) )
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ private static <T> boolean eq( T s1, T s2 )
+ {
+ return s1 != null ? s1.equals( s2 ) : s2 == null;
+ }
+
}
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java?rev=887367&r1=887366&r2=887367&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
Fri Dec 4 21:36:51 2009
@@ -344,6 +344,7 @@
request.setRemoteRepositories( project.getPluginArtifactRepositories() );
request.setCache( session.getRepositoryCache() );
request.setOffline( session.isOffline() );
+ request.setForceUpdate( session.getRequest().isUpdateSnapshots() );
request.setTransferListener( session.getRequest().getTransferListener() );
ArtifactFilter dependencyFilter = project.getExtensionArtifactFilter();
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java?rev=887367&r1=887366&r2=887367&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
Fri Dec 4 21:36:51 2009
@@ -96,6 +96,8 @@
request.setRemoteRepositories( project.getPluginArtifactRepositories() );
}
request.setOffline( session.isOffline() );
+ request.setForceUpdate( session.getRequest().isUpdateSnapshots() );
+ request.setTransferListener( session.getRequest().getTransferListener() );
return request;
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java?rev=887367&r1=887366&r2=887367&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
Fri Dec 4 21:36:51 2009
@@ -83,6 +83,7 @@
setCache( session.getRepositoryCache() );
setLocalRepository( session.getLocalRepository() );
setOffline( session.isOffline() );
+ setForceUpdate( session.getRequest().isUpdateSnapshots() );
setTransferListener( session.getRequest().getTransferListener() );
MavenProject project = session.getCurrentProject();
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java?rev=887367&r1=887366&r2=887367&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
Fri Dec 4 21:36:51 2009
@@ -92,6 +92,7 @@
setCache( session.getRepositoryCache() );
setLocalRepository( session.getLocalRepository() );
setOffline( session.isOffline() );
+ setForceUpdate( session.getRequest().isUpdateSnapshots() );
setTransferListener( session.getRequest().getTransferListener() );
MavenProject project = session.getCurrentProject();
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java?rev=887367&r1=887366&r2=887367&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
Fri Dec 4 21:36:51 2009
@@ -110,6 +110,8 @@
repositoryRequest.setLocalRepository( projectBuildingRequest.getLocalRepository()
);
repositoryRequest.setRemoteRepositories( pluginRepositories );
repositoryRequest.setOffline( projectBuildingRequest.isOffline() );
+ repositoryRequest.setForceUpdate( projectBuildingRequest.isForceUpdate()
);
+ repositoryRequest.setTransferListener( projectBuildingRequest.getTransferListener()
);
ProjectRealmCache.CacheRecord record =
projectBuildingHelper.createProjectRealm( project, model, repositoryRequest
);
Author: bentmann
Date: Fri Dec 4 21:26:16 2009
New Revision: 887362
URL: http://svn.apache.org/viewvc?rev=887362&view=rev
Log:
[MNG-4482] [regression] command line option "-update-snapshots" does not work for plugins/extensions
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/settings-template.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=887362&r1=887361&r2=887362&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Fri Dec 4 21:26:16 2009
@@ -85,6 +85,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+ suite.addTestSuite( MavenITmng4482ForcePluginSnapshotUpdateTest.class );
suite.addTestSuite( MavenITmng4474PerLookupWagonInstantiationTest.class );
suite.addTestSuite( MavenITmng4470AuthenticatedDeploymentToProxyTest.class );
suite.addTestSuite( MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.class );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java Fri Dec 4 21:26:16 2009
@@ -0,0 +1,84 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4482">MNG-4482</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4482ForcePluginSnapshotUpdateTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4482ForcePluginSnapshotUpdateTest()
+ {
+ super( "[2.0.3,3.0-alpha-1),[3.0-alpha-6,)" );
+ }
+
+ /**
+ * Verify that snapshot updates of plugins/extensions can be forced from the command line via "-U".
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4482" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4482" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
+
+ Properties filterProps = verifier.newDefaultFilterProperties();
+
+ filterProps.setProperty( "@repo@", "repo-1" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.setLogFileName( "log-force-1.txt" );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+
+ Properties props1 = verifier.loadProperties( "target/touch.properties" );
+ assertEquals( "old", props1.getProperty( "one" ) );
+ assertSame( null, props1.getProperty( "two" ) );
+
+ filterProps.setProperty( "@repo@", "repo-2" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.setLogFileName( "log-force-2.txt" );
+ verifier.deleteDirectory( "target" );
+ verifier.getCliOptions().add( "-U" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+
+ verifier.resetStreams();
+
+ Properties props2 = verifier.loadProperties( "target/touch.properties" );
+ assertEquals( "new", props2.getProperty( "two" ) );
+ assertSame( null, props2.getProperty( "one" ) );
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/pom.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/pom.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>coreit</packaging>
+
+ <name>Maven Integration Test :: MNG-4482</name>
+ <description>
+ Verify that snapshot updates of plugins/extensions can be forced from the command line via "-U".
+ </description>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>extension</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <configuration>
+ <outputFile>target/touch.properties</outputFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.jar?rev=887362&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.pom?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195644-1.pom Fri Dec 4 21:26:16 2009
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>extension</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>extension</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <timestamp>20091204.195644</timestamp>
+ <buildNumber>1</buildNumber>
+ </snapshot>
+ <lastUpdated>20091204195644</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>extension</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <versioning>
+ <versions>
+ <version>0.2-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20091204195644</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/extension/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <plugins>
+ <plugin>
+ <name>Maven Integration Test Plugin :: Touch</name>
+ <prefix>mng4482</prefix>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ </plugin>
+ </plugins>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <timestamp>20091204.194743</timestamp>
+ <buildNumber>1</buildNumber>
+ </snapshot>
+ <lastUpdated>20091204194743</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.jar?rev=887362&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.pom?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194743-1.pom Fri Dec 4 21:26:16 2009
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>Maven Integration Test Plugin :: Touch</name>
+ <description>
+ A test plugin that creates an empty file.
+ </description>
+ <inceptionYear>2009</inceptionYear>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <versioning>
+ <latest>0.1-SNAPSHOT</latest>
+ <versions>
+ <version>0.1-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20091204194743</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-1/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.jar?rev=887362&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.pom?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/extension-0.2-20091204.195734-2.pom Fri Dec 4 21:26:16 2009
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>extension</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>extension</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <timestamp>20091204.195734</timestamp>
+ <buildNumber>2</buildNumber>
+ </snapshot>
+ <lastUpdated>20091204195734</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/0.2-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>extension</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ <versioning>
+ <versions>
+ <version>0.2-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20091204195734</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/extension/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <plugins>
+ <plugin>
+ <name>Maven Integration Test Plugin :: Touch</name>
+ <prefix>mng4482</prefix>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ </plugin>
+ </plugins>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <timestamp>20091204.194942</timestamp>
+ <buildNumber>2</buildNumber>
+ </snapshot>
+ <lastUpdated>20091204194942</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.jar?rev=887362&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.pom?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/0.1-SNAPSHOT/maven-mng4482-plugin-0.1-20091204.194942-2.pom Fri Dec 4 21:26:16 2009
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>Maven Integration Test Plugin :: Touch</name>
+ <description>
+ A test plugin that creates an empty file.
+ </description>
+ <inceptionYear>2009</inceptionYear>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4482</groupId>
+ <artifactId>maven-mng4482-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <versioning>
+ <latest>0.1-SNAPSHOT</latest>
+ <versions>
+ <version>0.1-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20091204194942</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/repo-2/org/apache/maven/its/mng4482/maven-mng4482-plugin/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/settings-template.xml?rev=887362&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/settings-template.xml Fri Dec 4 21:26:16 2009
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<settings>
+ <profiles>
+ <profile>
+ <id>maven-core-it-repo</id>
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/@repo@</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ <!-- NOTE: This should be overriden by -U from the CLI -->
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/@repo@</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ <!-- NOTE: This should be overriden by -U from the CLI -->
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4482/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Author: bentmann
Date: Fri Dec 4 18:26:21 2009
New Revision: 887311
URL: http://svn.apache.org/viewvc?rev=887311&view=rev
Log:
o Restored (binary) backward-compat
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=887311&r1=887310&r2=887311&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Fri Dec 4 18:26:21 2009
@@ -1824,6 +1824,12 @@
return snapshotArtifactRepository;
}
+ @Deprecated
+ public Artifact replaceWithActiveArtifact( Artifact pluginArtifact )
+ {
+ return pluginArtifact;
+ }
+
private void deepCopy( MavenProject project )
{
// disown the parent
Author: bentmann
Date: Fri Dec 4 15:51:18 2009
New Revision: 887236
URL: http://svn.apache.org/viewvc?rev=887236&view=rev
Log:
o Added some more comments on running the ITs
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=887236&r1=887235&r2=887236&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Fri Dec 4 15:51:18 2009
@@ -34,6 +34,13 @@
<name>Maven Integration Tests</name>
<!--
+ By default, the project just packages the tests in an artifact. To actually run them, activate
the profile "run-its":
+ mvn clean test -Prun-its
+
+ This will subject the Maven version running the build to the integration tests. If you
would like to test a different
+ Maven distribution, you can use the system property "mavenHome" to specify the path of
the Maven distribution to test:
+ mvn clean test -Prun-its -DmavenHome=<maven-under-test>
+
To run the ITs using embedded Maven 3.x, add -D verifier.forkMode=auto. This will require
more memory, something like
MAVEN_OPTS=-Xmx256m -XX:MaxPermSize=128m
seems to work.
Author: brianf
Date: Fri Dec 4 04:36:14 2009
New Revision: 887056
URL: http://svn.apache.org/viewvc?rev=887056&view=rev
Log:
disabled failing repos
Modified:
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv
maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv?rev=887056&r1=887055&r2=887056&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/disabled.csv Fri Dec 4 04:36:14
2009
@@ -7,6 +7,9 @@
"org.apithefire","nobody@apithefire.org:/var/www/apithefire.org/m2repo","rsync_ssh","Chew
Boon Aik","apithefire@gmail.com",,
"org.appspy","rsync@nexus.appspy.org:m2repo/releases","rsync_ssh","Olivier HEDIN","olivier@appspy.org",,
"de.berlios.jsunit","mavensync@shell.berlios.de:/home/groups/jsunit/htdocs/maven2/repo","rsync_ssh","Joerg
Schaible","joerg.schaible@gmx.de",,
+"org.zeroturnaround","rsync://repos.zeroturnaround.com/maven2/","rsync","Jevgeni Kabanov","jevgeni@zeroturnaround.com",,
+"net.sf.xradar","mavensync@web.sourceforge.net:/home/groups/x/xr/xradar/htdocs/m2repo","rsync_ssh","Nicolas
Dordet","dordet.n@gmail.com",,
+"net.javacrumbs","rsync://javacrumbs.net/m2repo","rsync","Lukas Krecan","lukas@krecan.net",,
#these email addresses are invalid:
"net.sf.locale4j","mavensync@web.sourceforge.net:/home/groups/l/lo/locale4j/maven/upload-repo","rsync_ssh",,"tom.cort@state.vt.us",,
Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=887056&r1=887055&r2=887056&view=diff
==============================================================================
--- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original)
+++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Fri Dec 4 04:36:14
2009
@@ -104,7 +104,6 @@
"net.israfil","ibiblio@repo.israfil.net:maven2","rsync_ssh","Christian Gruber","cgruber@israfil.net","-l
ibiblio",
"net.java.dev.jets3t","mavensync@web.sourceforge.net:/home/groups/j/je/jets3t/htdocs/maven2/","rsync_ssh","James
Murty","jmurty@dev.java.net",,
"net.java.dev.jvyaml","mavensync@web.sourceforge.net:/home/users/o/ou/ouaibsky/maven/m2repo","rsync_ssh","Ouaibsky","ouaibsky@free.fr",,
-"net.javacrumbs","rsync://javacrumbs.net/m2repo","rsync","Lukas Krecan","lukas@krecan.net",,
"net.jcip","jvanzyl@people.apache.org:/home/nicolas/rsync-to-central","rsync_ssh","Nicolas
De Loof","nicolas@apache.org",,
"net.liftweb","mavensync@lion.harpoon.me:/home/scalatools/hudson/www/repo-releases","rsync_ssh","Josh
Suereth","admin@scala-tools.org",,
"net.objectlab.kit.datecalc","mavensync@web.sourceforge.net:/home/groups/o/ob/objectlabkit/htdocs/m2-repo","rsync_ssh","Marcin
Jekot","marchy@users.sourceforge.net",,
@@ -176,7 +175,6 @@
"net.sf.twip","mavensync@web.sourceforge.net:/home/groups/t/tw/twip/htdocs/maven/repository","rsync_ssh","Snackbox","snackbox@users.sourceforge.net",,
"net.sf.webtestfixtures","mavensync@web.sourceforge.net:/home/groups/w/we/webtestfixtures/htdocs/m2repo/releases","rsync_ssh","Pal
Brattberg","brattberg@gmail.com",,
"net.sf.xisemele","mavensync@web.sourceforge.net:/home/groups/x/xi/xisemele/htdocs/maven","rsync_ssh","Carlos
Eduardo Coral","ducoral@gmail.com",,
-"net.sf.xradar","mavensync@web.sourceforge.net:/home/groups/x/xr/xradar/htdocs/m2repo","rsync_ssh","Nicolas
Dordet","dordet.n@gmail.com",,
"net.sf.xslthl","mavensync@web.sourceforge.net:/home/groups/x/xs/xslthl/htdocs/maven/repository","rsync_ssh","Cedric
Pronzato","mimil@users.sourceforge.net",,
"net.sf.yac-io","mavensync@web.sourceforge.net:/home/groups/y/ya/yac-io/htdocs/m2repo/release","rsync_ssh","Kenji
Tayama","ktayama@users.sourceforge.net",,
"net.smartlab.config","mavensync@web.sourceforge.net:/home/groups/s/sm/smartconfig/htdocs/releases","rsync_ssh","Antonio
Talarico","atalarico@users.sourceforge.net",,
@@ -306,7 +304,7 @@
"org.xj4","mavensync@web.sourceforge.net:/home/groups/x/xj/xj4/htdocs/m2repo/releases","rsync_ssh","Jared
Bunting","jared.bunting@peachjean.com",,
"org.xlightweb","mavensync@web.sourceforge.net:/home/groups/x/xl/xlightweb/htdocs/m2repo","rsync_ssh","Gregor
Roth","grro@xlightweb.org",,
"org.xsocket","mavensync@web.sourceforge.net:/home/groups/x/xs/xsocket/htdocs/m2repo","rsync_ssh","Gregor
Roth","grro@xsocket.org",,
-"org.zeroturnaround","rsync://repos.zeroturnaround.com/maven2/","rsync","Jevgeni Kabanov","jevgeni@zeroturnaround.com",,
+
"org.zkoss","maven@mavensync.zkoss.org:/home/maven/repository","rsync_ssh","WebMaster","webmaster@zkoss.org",,
"pmd","mavensync@web.sourceforge.net:/home/groups/p/pm/pmd/htdocs/maven2","rsync_ssh","Xavier
Le Vourch","xavier@brittanysoftware.com",,
"se.grunddata.dzo","mavensync@web.sourceforge.net:/home/groups/d/dz/dzo/htdocs/m2repo","rsync_ssh","Ulf
Naslund","ulf.naslund@grunddata.se",,
Author: bentmann
Date: Thu Dec 3 22:19:30 2009
New Revision: 886952
URL: http://svn.apache.org/viewvc?rev=886952&view=rev
Log:
o Added license header
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java?rev=886952&r1=886951&r2=886952&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
(original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
Thu Dec 3 22:19:30 2009
@@ -1,5 +1,24 @@
package org.apache.maven.plugin.announcement;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.execution.MavenSession;
Author: dennisl
Date: Thu Dec 3 19:38:47 2009
New Revision: 886892
URL: http://svn.apache.org/viewvc?rev=886892&view=rev
Log:
o Minor adjustments to "Close the staging repository"
Modified:
maven/site/trunk/src/site/apt/developers/release/apache-release.apt
Modified: maven/site/trunk/src/site/apt/developers/release/apache-release.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/apache-release.apt?rev=886892&r1=886891&r2=886892&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/developers/release/apache-release.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/apache-release.apt Thu Dec 3 19:38:47
2009
@@ -153,10 +153,11 @@
[[5]] Close the staging repository
Login to <<<{{https://repository.apache.org}}>>> using your Apache SVN
credentials. Click on "Staging". Then click
- on "org.apache.maven" in the list of repositories. In the panel below you should see an
open repository that is linked
+ on "maven" in the list of repositories. In the panel below you should see an open repository
that is linked
to your username and ip. Right click on this repository and select "Close". This will close
the repository from future
deployments and make it available for others to view. If you are staging multiple releases
together, skip this step
- until you have staged everything.
+ until you have staged everything. Enter the name and version of the artifact being released
in the "Description" field
+ and then click "Close". This will make it easier to identify it later.
See the image below for details.
Author: dennisl
Date: Thu Dec 3 18:43:03 2009
New Revision: 886878
URL: http://svn.apache.org/viewvc?rev=886878&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=886878&r1=886877&r2=886878&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Thu Dec 3 18:43:03 2009
@@ -29,7 +29,7 @@
</parent>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Changes Report Plugin</name>
@@ -63,9 +63,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.3</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.3</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-changes-plugin-2.3</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/</url>
</scm>
<issueManagement>
<system>jira</system>
Author: dennisl
Date: Thu Dec 3 18:42:45 2009
New Revision: 886877
URL: http://svn.apache.org/viewvc?rev=886877&view=rev
Log:
[maven-scm] copy for tag maven-changes-plugin-2.3
Added:
maven/plugins/tags/maven-changes-plugin-2.3/
- copied from r886876, maven/plugins/trunk/maven-changes-plugin/
Author: dennisl
Date: Thu Dec 3 18:42:18 2009
New Revision: 886876
URL: http://svn.apache.org/viewvc?rev=886876&view=rev
Log:
[maven-release-plugin] prepare release maven-changes-plugin-2.3
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=886876&r1=886875&r2=886876&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Thu Dec 3 18:42:18 2009
@@ -29,7 +29,7 @@
</parent>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.3</version>
<packaging>maven-plugin</packaging>
<name>Maven Changes Report Plugin</name>
@@ -63,9 +63,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changes-plugin/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changes-plugin-2.3</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-changes-plugin-2.3</url>
</scm>
<issueManagement>
<system>jira</system>
Author: olamy
Date: Thu Dec 3 18:15:31 2009
New Revision: 886872
URL: http://svn.apache.org/viewvc?rev=886872&view=rev
Log:
note rev from trunk to merge here
Added:
maven/plugins/branches/maven-site-plugin-3.x/patch-from-trunk.txt (with props)
Added: maven/plugins/branches/maven-site-plugin-3.x/patch-from-trunk.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/patch-from-trunk.txt?rev=886872&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/patch-from-trunk.txt (added)
+++ maven/plugins/branches/maven-site-plugin-3.x/patch-from-trunk.txt Thu Dec 3 18:15:31
2009
@@ -0,0 +1,3 @@
+rev to merge from trunk
+- 886844
+- 886847
Propchange: maven/plugins/branches/maven-site-plugin-3.x/patch-from-trunk.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/maven-site-plugin-3.x/patch-from-trunk.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Author: dennisl
Date: Thu Dec 3 17:02:45 2009
New Revision: 886847
URL: http://svn.apache.org/viewvc?rev=886847&view=rev
Log:
[MSITE-437] How format-specific files are created and linked is not 100% clear
Submitted by: Dave Copeland
Reviewed by: Dennis Lundberg
o Patch applied with minor modifications
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm?rev=886847&r1=886846&r2=886847&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm Thu
Dec 3 17:02:45 2009
@@ -50,12 +50,12 @@
+- site.xml
--------------------
- You notice the <<<$\{basedir\}/src/site>>> directory which contains a
site
+ The <<<$\{basedir\}/src/site>>> directory which contains a site
descriptor along with various directories corresponding to the supported
document formats. Let's take a look at examples of the various document
formats.
- The APT format, "Almost Plain Text", is a wiki-like format that allows you to
+ The APT format ("Almost Plain Text") is a wiki-like format that allows you to
write simple, structured documents (like this one) very quickly. A full
reference of the
{{{http://maven.apache.org/doxia/references/apt-format.html} APT Format}} is
@@ -94,7 +94,13 @@
+- other.html
--------------------
- The <<<css>>> and <<<images>>> directories contains
stylesheets and images
+ This means that <<</src/site/apt/index.apt>>> will be available in the
site as
+ <<</index.html>>>. So, in {{{./sitedescriptor.html} your site descriptor}}
you
+ might link to <<</index.html>>> and <<</other.html>>>,
where the source of
+ these two files would be <<</src/site/apt/index.apt>>> and
+ <<</src/site/xdoc/other.xdoc>>>.
+
+ The <<<css>>> and <<<images>>> directories contain
stylesheets and images
from the skin being used. You can read more about skins in
{{{./sitedescriptor.html}the site descriptor documentation}}.
Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?rev=886847&r1=886846&r2=886847&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt Thu Dec
3 17:02:45 2009
@@ -173,20 +173,26 @@
* Including Generated Content
- There are several preset menus that can be used in the site descriptor to include generated
content from your project.
- These are:
+ Files in the format-based directory structure can be linked to by their target
+ HTML filename, e.g. <<<${basedir}/src/site/apt/foo.apt>>> and
+ <<<${basedir}/src/site/fml/faq.fml>>> can be linked to via:
- * <<<reports>>> - a menu with links to all the generated reports for
your
- project
-
- * <<<parent>>> - a menu with a link to the parent project's site
-
- * <<<modules>>> - a menu containing the links to the sites of the submodules
- of this project
-
- []
++-----+
+<project>
+ ...
+ <body>
+ ...
+ <menu name="Foo" href="foo.html" />
+ <menu name="FAQ" href="faq.html" />
+ ...
+ </body>
+ ...
+</project>
++-----+
- To include a preset menu, use the <<<ref>>> attribute. For example:
+ There are also several preset menus that can be used in the site descriptor to
+ include generated content from your project. These are linked via the
+ <<<ref>>> attribute, like so:
+-----+
<project>
@@ -205,6 +211,19 @@
syntax instead. The support for the old syntax will be removed in a future
version of the Site Plugin.
+ The currently available preset menus are:
+
+ * <<<reports>>> - a menu with links to all the generated reports for
your
+ project
+
+ * <<<parent>>> - a menu with a link to the parent project's site
+
+ * <<<modules>>> - a menu containing the links to the sites of the submodules
+ of this project
+
+ []
+
+
* Skinning
Skins can be created to customize the look and feel of a site in a consistent way. For
more information on creating a
Author: dennisl
Date: Thu Dec 3 16:28:04 2009
New Revision: 886844
URL: http://svn.apache.org/viewvc?rev=886844&view=rev
Log:
[MSITE-406] jetty in site run holds unnecessary file lock in windows
Submitted by: Michael Osipov
Reviewed by: Dennis Lundberg
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java?rev=886844&r1=886843&r2=886844&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
Thu Dec 3 16:28:04 2009
@@ -148,6 +148,7 @@
webapp.setContextPath( "/" );
webapp.setResourceBase( tempWebappDirectory.getAbsolutePath() );
webapp.setAttribute( DoxiaFilter.SITE_RENDERER_KEY, siteRenderer );
+ webapp.getInitParams().put( "org.mortbay.jetty.servlet.Default.useFileMappedBuffer",
"false" );
// For external reports
project.getReporting().setOutputDirectory( tempWebappDirectory.getAbsolutePath()
);
Author: dennisl
Date: Thu Dec 3 14:27:02 2009
New Revision: 886792
URL: http://svn.apache.org/viewvc?rev=886792&view=rev
Log:
[MCHANGES-189] There are presentation problems in the changes-report if an issue in changes.xml
contains characters like < and >
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=886792&r1=886791&r2=886792&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
(original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
Thu Dec 3 14:27:02 2009
@@ -226,7 +226,7 @@
sink.tableCell();
- sink.rawText( action.getAction() );
+ sink.text( action.getAction() );
// no null check needed classes from modello return a new ArrayList
if ( StringUtils.isNotEmpty( action.getIssue() ) || ( !action.getFixedIssues().isEmpty()
) )
Author: dennisl
Date: Thu Dec 3 14:19:55 2009
New Revision: 886787
URL: http://svn.apache.org/viewvc?rev=886787&view=rev
Log:
[MCHANGES-151] A patch about the date parsing and html encoding for maven-changes-plugin-trac
Submitted by: zhoushuqun
Reviewed by: Dennis Lundberg
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java?rev=886787&r1=886786&r2=886787&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java
(original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracReportGenerator.java
Thu Dec 3 14:19:55 2009
@@ -305,7 +305,7 @@
if ( text != null )
{
- sink.rawText( text );
+ sink.text( text );
}
else
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java?rev=886787&r1=886786&r2=886787&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java
(original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracTicket.java
Thu Dec 3 14:19:55 2009
@@ -23,6 +23,7 @@
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
+import java.util.Locale;
/**
* A Trac Ticket.
@@ -194,7 +195,7 @@
}
catch ( NumberFormatException e )
{
- SimpleDateFormat format = new SimpleDateFormat( "EEE MMM dd HH:mm:ss z yyyy"
);
+ SimpleDateFormat format = new SimpleDateFormat( "EEE MMM dd HH:mm:ss z yyyy",
Locale.ENGLISH );
try
{
return format.parse( timeCreated );
Author: dennisl
Date: Thu Dec 3 14:16:51 2009
New Revision: 886786
URL: http://svn.apache.org/viewvc?rev=886786&view=rev
Log:
[MCHANGES-138] Exception thrown when issueManagement section of pom is missing
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=886786&r1=886785&r2=886786&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
(original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Thu Dec 3 14:16:51 2009
@@ -315,9 +315,16 @@
{
ChangesXML changesXML = new ChangesXML( getXmlPath(), getLog() );
List changesReleases = changesXML.getReleaseList();
- List jiraReleases = getJiraReleases();
- List mergedReleases = mergeReleases( changesReleases, jiraReleases );
- doGenerate( mergedReleases );
+ if ( validateIfIssueManagementComplete() )
+ {
+ List jiraReleases = getJiraReleases();
+ List mergedReleases = mergeReleases( changesReleases, jiraReleases );
+ doGenerate( mergedReleases );
+ }
+ else
+ {
+ throw new MojoExecutionException( "Something is wrong with the Issue
Management section. See previous error messages." );
+ }
}
else
{
@@ -588,11 +595,18 @@
public void doJiraGenerate()
throws MojoExecutionException
{
- List releases = getJiraReleases();
+ if ( validateIfIssueManagementComplete() )
+ {
+ List releases = getJiraReleases();
- getLog().info( "Creating announcement file from JIRA releases..." );
+ getLog().info( "Creating announcement file from JIRA releases..." );
- doGenerate( releases );
+ doGenerate( releases );
+ }
+ else
+ {
+ throw new MojoExecutionException( "Something is wrong with the Issue Management
section. See previous error messages." );
+ }
}
protected List getJiraReleases()
@@ -700,6 +714,34 @@
return mergedReleases;
}
+ /**
+ * This method was copied from JiraMojo and modified.
+ */
+ private boolean validateIfIssueManagementComplete()
+ {
+ if ( project.getIssueManagement() == null )
+ {
+ getLog().error( "No Issue Management set. No JIRA announcement will be made."
);
+
+ return false;
+ }
+ else if ( ( project.getIssueManagement().getUrl() == null )
+ || ( project.getIssueManagement().getUrl().trim().equals( "" ) ) )
+ {
+ getLog().error( "No URL set in Issue Management. No JIRA announcement will be
made." );
+
+ return false;
+ }
+ else if ( ( project.getIssueManagement().getSystem() != null )
+ && !( project.getIssueManagement().getSystem().equalsIgnoreCase( "jira"
) ) )
+ {
+ getLog().error( "No JIRA Issue Management system configured. No JIRA announcement
will be made." );
+
+ return false;
+ }
+ return true;
+ }
+
/*
* accessors
*/
Author: dennisl
Date: Wed Dec 2 21:45:12 2009
New Revision: 886320
URL: http://svn.apache.org/viewvc?rev=886320&view=rev
Log:
o Set EOL-style to native
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/verify.groovy (contents,
props changed)
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/verify.groovy (contents,
props changed)
Modified: maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/verify.groovy?rev=886320&r1=886319&r2=886320&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/verify.groovy (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/verify.groovy Wed Dec 2 21:45:12
2009
@@ -1,45 +1,45 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-assert new File(basedir, 'target/surefire-reports').exists();
-assert new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').exists();
-content = new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').text;
-
-assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' );
-
-assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
-
-assert new File(basedir, 'target/site/surefire-report.html').exists();
-assert new File(basedir, 'target/site/index.html').exists();
-assert new File(basedir, 'target/site/checkstyle.html').exists();
-assert new File(basedir, 'target/site/cpd.html').exists();
-assert new File(basedir, 'target/site/apidocs/index.html').exists();
-assert new File(basedir, 'target/site/apidocs/org/apache/maven/plugins/site/its/App.html').exists();
-assert new File(basedir, 'target/site/cobertura/index.html').exists();
-assert new File(basedir, 'target/site/xref/index.html').exists();
-assert new File(basedir, 'target/site/xref-test/index.html').exists();
-
-assert new File(basedir, 'target/site/taglist.html').exists();
-assert new File(basedir, 'target/site/team-list.html').exists();
-
-assert new File(basedir, 'target/site/dependencies.html').exists();
-content = new File(basedir, 'target/site/dependencies.html').text;
-assert content.contains( 'junit:junit:jar:3.8.2' );
-
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+assert new File(basedir, 'target/surefire-reports').exists();
+assert new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').exists();
+content = new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').text;
+
+assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' );
+
+assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
+
+assert new File(basedir, 'target/site/surefire-report.html').exists();
+assert new File(basedir, 'target/site/index.html').exists();
+assert new File(basedir, 'target/site/checkstyle.html').exists();
+assert new File(basedir, 'target/site/cpd.html').exists();
+assert new File(basedir, 'target/site/apidocs/index.html').exists();
+assert new File(basedir, 'target/site/apidocs/org/apache/maven/plugins/site/its/App.html').exists();
+assert new File(basedir, 'target/site/cobertura/index.html').exists();
+assert new File(basedir, 'target/site/xref/index.html').exists();
+assert new File(basedir, 'target/site/xref-test/index.html').exists();
+
+assert new File(basedir, 'target/site/taglist.html').exists();
+assert new File(basedir, 'target/site/team-list.html').exists();
+
+assert new File(basedir, 'target/site/dependencies.html').exists();
+content = new File(basedir, 'target/site/dependencies.html').text;
+assert content.contains( 'junit:junit:jar:3.8.2' );
+
return true;
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/verify.groovy?rev=886320&r1=886319&r2=886320&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/verify.groovy (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/verify.groovy Wed Dec 2
21:45:12 2009
@@ -1,31 +1,31 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-assert new File(basedir, 'target/surefire-reports').exists();
-assert new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').exists();
-content = new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').text;
-
-assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' );
-
-assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
-
-assert new File(basedir, 'target/site/surefire-report.html').exists();
-assert !new File(basedir, 'target/site/index.html').exists();
-
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+assert new File(basedir, 'target/surefire-reports').exists();
+assert new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').exists();
+content = new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').text;
+
+assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' );
+
+assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
+
+assert new File(basedir, 'target/site/surefire-report.html').exists();
+assert !new File(basedir, 'target/site/index.html').exists();
+
return true;
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Author: pgier
Date: Wed Dec 2 21:35:35 2009
New Revision: 886317
URL: http://svn.apache.org/viewvc?rev=886317&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=886317&r1=886316&r2=886317&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Wed Dec 2 21:35:35 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<name>Maven Ant Tasks</name>
<description>Ant Tasks used for Maven integration</description>
@@ -110,9 +110,9 @@
</mailingLists>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/ant-tasks/trunk</url>
</scm>
<issueManagement>
Author: pgier
Date: Wed Dec 2 21:35:32 2009
New Revision: 886316
URL: http://svn.apache.org/viewvc?rev=886316&view=rev
Log:
[maven-scm] copy for tag maven-ant-tasks-2.1.0
Added:
maven/ant-tasks/tags/maven-ant-tasks-2.1.0/
- copied from r886315, maven/ant-tasks/trunk/
Author: pgier
Date: Wed Dec 2 21:35:26 2009
New Revision: 886315
URL: http://svn.apache.org/viewvc?rev=886315&view=rev
Log:
[maven-release-plugin] prepare release maven-ant-tasks-2.1.0
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=886315&r1=886314&r2=886315&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Wed Dec 2 21:35:26 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<name>Maven Ant Tasks</name>
<description>Ant Tasks used for Maven integration</description>
@@ -110,9 +110,9 @@
</mailingLists>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/ant-tasks/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</url>
</scm>
<issueManagement>
Author: pgier
Date: Wed Dec 2 21:31:47 2009
New Revision: 886313
URL: http://svn.apache.org/viewvc?rev=886313&view=rev
Log:
Fix property on installation page.
Modified:
maven/ant-tasks/trunk/src/site/apt/installation.apt.vm
Modified: maven/ant-tasks/trunk/src/site/apt/installation.apt.vm
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/site/apt/installation.apt.vm?rev=886313&r1=886312&r2=886313&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/site/apt/installation.apt.vm (original)
+++ maven/ant-tasks/trunk/src/site/apt/installation.apt.vm Wed Dec 2 21:31:47 2009
@@ -61,7 +61,7 @@
-----
<project ... xmlns:artifact="antlib:org.apache.maven.artifact.ant">
...
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-{project.version}.jar"
/>
+ <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-${project.version}.jar"
/>
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath" />
Author: pgier
Date: Wed Dec 2 21:27:12 2009
New Revision: 886307
URL: http://svn.apache.org/viewvc?rev=886307&view=rev
Log:
Redo tag to fix site issues brought up in release voting.
Removed:
maven/ant-tasks/tags/maven-ant-tasks-2.1.0/
Author: pgier
Date: Wed Dec 2 21:25:43 2009
New Revision: 886306
URL: http://svn.apache.org/viewvc?rev=886306&view=rev
Log:
Add mailing lists and make a correction to the installation page of the site.
Added:
maven/ant-tasks/trunk/src/site/apt/installation.apt.vm
- copied, changed from r885614, maven/ant-tasks/trunk/src/site/apt/installation.apt
Removed:
maven/ant-tasks/trunk/src/site/apt/installation.apt
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=886306&r1=886305&r2=886306&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Wed Dec 2 21:25:43 2009
@@ -28,21 +28,98 @@
<version>15</version>
</parent>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-ant-tasks</artifactId>
<version>2.1.0-SNAPSHOT</version>
<name>Maven Ant Tasks</name>
+ <description>Ant Tasks used for Maven integration</description>
<url>http://maven.apache.org/ant-tasks/</url>
+ <mailingLists>
+ <mailingList>
+ <name>Maven User List</name>
+ <subscribe>users-subscribe@maven.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
+ <post>users@maven.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/users@maven.apache.org/</otherArchive>
+ <otherArchive>http://www.nabble.com/Maven---Users-f178.html</otherArchive>
+ <otherArchive>http://maven.users.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Maven Developer List</name>
+ <subscribe>dev-subscribe@maven.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@maven.apache.org</unsubscribe>
+ <post>dev@maven.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/dev@maven.apache.org/</otherArchive>
+ <otherArchive>http://www.nabble.com/Maven-Developers-f179.html</otherArchive>
+ <otherArchive>http://maven.dev.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Maven Issues List</name>
+ <subscribe>issues-subscribe@maven.apache.org</subscribe>
+ <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/issues@maven.apache.org</otherArchive>
+ <otherArchive>http://www.nabble.com/Maven---Issues-f15573.html</otherArchive>
+ <otherArchive>http://maven.issues.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Maven Commits List</name>
+ <subscribe>commits-subscribe@maven.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/commits@maven.apache.org</otherArchive>
+ <otherArchive>http://www.nabble.com/Maven---Commits-f15575.html</otherArchive>
+ <otherArchive>http://maven.commits.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <!-- duplication from parent pom - temporary until they inherit properly -->
+ <mailingList>
+ <name>Maven Announcements List</name>
+ <post>announce@maven.apache.org</post>
+ <subscribe>announce-subscribe@maven.apache.org</subscribe>
+ <unsubscribe>announce-unsubscribe@maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/announce@maven.apache.org</otherArchive>
+ <otherArchive>http://www.nabble.com/Maven-Announcements-f15617.html</otherArchive>
+ <otherArchive>http://maven.announce.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Maven Notifications List</name>
+ <subscribe>notifications-subscribe@maven.apache.org</subscribe>
+ <unsubscribe>notifications-unsubscribe@maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/notifications@maven.apache.org</otherArchive>
+ <otherArchive>http://www.nabble.com/Maven---Notifications-f15574.html</otherArchive>
+ <otherArchive>http://maven.notifications.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ </mailingLists>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/maven/ant-tasks/trunk</url>
</scm>
+
<issueManagement>
<system>jira</system>
<url>http://jira.codehaus.org/browse/MANTTASKS</url>
</issueManagement>
+
<distributionManagement>
<site>
<id>apache.website</id>
Copied: maven/ant-tasks/trunk/src/site/apt/installation.apt.vm (from r885614, maven/ant-tasks/trunk/src/site/apt/installation.apt)
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/site/apt/installation.apt.vm?p2=maven/ant-tasks/trunk/src/site/apt/installation.apt.vm&p1=maven/ant-tasks/trunk/src/site/apt/installation.apt&r1=885614&r2=886306&rev=886306&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/site/apt/installation.apt (original)
+++ maven/ant-tasks/trunk/src/site/apt/installation.apt.vm Wed Dec 2 21:25:43 2009
@@ -61,7 +61,7 @@
-----
<project ... xmlns:artifact="antlib:org.apache.maven.artifact.ant">
...
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.0.10.jar" />
+ <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-{project.version}.jar"
/>
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath" />
Author: pgier
Date: Wed Dec 2 21:19:12 2009
New Revision: 886304
URL: http://svn.apache.org/viewvc?rev=886304&view=rev
Log:
Redo the release to fix a couple of site issues.
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=886304&r1=886303&r2=886304&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Wed Dec 2 21:19:12 2009
@@ -29,7 +29,7 @@
</parent>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>Maven Ant Tasks</name>
<url>http://maven.apache.org/ant-tasks/</url>
Author: bentmann
Date: Wed Dec 2 20:01:16 2009
New Revision: 886293
URL: http://svn.apache.org/viewvc?rev=886293&view=rev
Log:
o Fixed version
Modified:
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=886293&r1=886292&r2=886293&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Wed Dec 2 20:01:16 2009
@@ -29,7 +29,7 @@
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Enforcer</name>
Author: jvanzyl
Date: Tue Dec 1 19:52:07 2009
New Revision: 885897
URL: http://svn.apache.org/viewvc?rev=885897&view=rev
Log:
o swap in the new ant tasks, bootstrap works with a clean repository
Added:
maven/maven-3/trunk/maven-ant-tasks-2.1.0.jar (with props)
Removed:
maven/maven-3/trunk/maven-ant-tasks-2.1.0-SNAPSHOT.jar
Modified:
maven/maven-3/trunk/build.xml
Modified: maven/maven-3/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/build.xml?rev=885897&r1=885896&r2=885897&view=diff
==============================================================================
--- maven/maven-3/trunk/build.xml (original)
+++ maven/maven-3/trunk/build.xml Tue Dec 1 19:52:07 2009
@@ -35,7 +35,7 @@
<target name="initTaskDefs">
<xmlproperty file="pom.xml" prefix="pom.xml" />
- <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.0-SNAPSHOT.jar" />
+ <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.0.jar" />
<!--
<path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.10.jar" />
-->
Added: maven/maven-3/trunk/maven-ant-tasks-2.1.0.jar
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-ant-tasks-2.1.0.jar?rev=885897&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/maven-3/trunk/maven-ant-tasks-2.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Author: pgier
Date: Tue Dec 1 17:47:26 2009
New Revision: 885847
URL: http://svn.apache.org/viewvc?rev=885847&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=885847&r1=885846&r2=885847&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Tue Dec 1 17:47:26 2009
@@ -29,15 +29,15 @@
</parent>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<name>Maven Ant Tasks</name>
<url>http://maven.apache.org/ant-tasks/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/ant-tasks/trunk</url>
</scm>
<issueManagement>
<system>jira</system>
Author: pgier
Date: Tue Dec 1 17:47:23 2009
New Revision: 885846
URL: http://svn.apache.org/viewvc?rev=885846&view=rev
Log:
[maven-scm] copy for tag maven-ant-tasks-2.1.0
Added:
maven/ant-tasks/tags/maven-ant-tasks-2.1.0/
- copied from r885845, maven/ant-tasks/trunk/
Author: pgier
Date: Tue Dec 1 17:47:15 2009
New Revision: 885845
URL: http://svn.apache.org/viewvc?rev=885845&view=rev
Log:
[maven-release-plugin] prepare release maven-ant-tasks-2.1.0
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=885845&r1=885844&r2=885845&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Tue Dec 1 17:47:15 2009
@@ -29,15 +29,15 @@
</parent>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<name>Maven Ant Tasks</name>
<url>http://maven.apache.org/ant-tasks/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/ant-tasks/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</url>
</scm>
<issueManagement>
<system>jira</system>
Author: pgier
Date: Tue Dec 1 17:07:05 2009
New Revision: 885836
URL: http://svn.apache.org/viewvc?rev=885836&view=rev
Log:
Update plexus-util and plexus interpolation to match transitive deps from Maven 2.2.1.
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=885836&r1=885835&r2=885836&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Tue Dec 1 17:07:05 2009
@@ -86,12 +86,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.5</version>
+ <version>1.5.15</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.9</version>
+ <version>1.11</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Author: pgier
Date: Tue Dec 1 17:03:35 2009
New Revision: 885835
URL: http://svn.apache.org/viewvc?rev=885835&view=rev
Log:
Rollback release due to look into duplication of plexus interpolation.
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=885835&r1=885834&r2=885835&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Tue Dec 1 17:03:35 2009
@@ -29,7 +29,7 @@
</parent>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>Maven Ant Tasks</name>
<url>http://maven.apache.org/ant-tasks/</url>
Author: pgier
Date: Tue Dec 1 16:47:55 2009
New Revision: 885830
URL: http://svn.apache.org/viewvc?rev=885830&view=rev
Log:
Rollback release to fix shaded jar.
Removed:
maven/ant-tasks/tags/maven-ant-tasks-2.1.0/
Author: pgier
Date: Tue Dec 1 16:38:22 2009
New Revision: 885828
URL: http://svn.apache.org/viewvc?rev=885828&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=885828&r1=885827&r2=885828&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Tue Dec 1 16:38:22 2009
@@ -29,15 +29,15 @@
</parent>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<name>Maven Ant Tasks</name>
<url>http://maven.apache.org/ant-tasks/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/ant-tasks/trunk</url>
</scm>
<issueManagement>
<system>jira</system>
Author: pgier
Date: Tue Dec 1 16:38:20 2009
New Revision: 885827
URL: http://svn.apache.org/viewvc?rev=885827&view=rev
Log:
[maven-scm] copy for tag maven-ant-tasks-2.1.0
Added:
maven/ant-tasks/tags/maven-ant-tasks-2.1.0/
- copied from r885826, maven/ant-tasks/trunk/
Author: pgier
Date: Tue Dec 1 16:38:13 2009
New Revision: 885826
URL: http://svn.apache.org/viewvc?rev=885826&view=rev
Log:
[maven-release-plugin] prepare release maven-ant-tasks-2.1.0
Modified:
maven/ant-tasks/trunk/pom.xml
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=885826&r1=885825&r2=885826&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Tue Dec 1 16:38:13 2009
@@ -29,15 +29,15 @@
</parent>
<artifactId>maven-ant-tasks</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<name>Maven Ant Tasks</name>
<url>http://maven.apache.org/ant-tasks/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/ant-tasks/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/ant-tasks/tags/maven-ant-tasks-2.1.0</url>
</scm>
<issueManagement>
<system>jira</system>
Author: pgier
Date: Tue Dec 1 16:37:10 2009
New Revision: 885825
URL: http://svn.apache.org/viewvc?rev=885825&view=rev
Log:
Update release notes for 2.1.0 release.
Modified:
maven/ant-tasks/trunk/src/site/apt/release-notes.apt
Modified: maven/ant-tasks/trunk/src/site/apt/release-notes.apt
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/site/apt/release-notes.apt?rev=885825&r1=885824&r2=885825&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/site/apt/release-notes.apt (original)
+++ maven/ant-tasks/trunk/src/site/apt/release-notes.apt Tue Dec 1 16:37:10 2009
@@ -28,6 +28,41 @@
Maven Ant Tasks
+* 2.1.0 Release Notes
+
+ The full list of changes can be found in our {{{http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=11533&version=13522}issue
management system}}, and is reproduced below.
+
+** Bug
+
+ * [MANTTASKS-4] - System scope not working properly in Maven Antlib
+
+ * [MANTTASKS-152] - Mvn task omit localRepository param
+
+ * [MANTTASKS-153] - Properties defined in Ant are not passed to Maven
+
+ * [MANTTASKS-155] - Dependency fileset should set the current ant project
+
+ * [MANTTASKS-159] - Wrong credentials used for mirrored repositories
+
+ * [MANTTASKS-160] - Wrong metadata files created for mirrored remote repositories
+
+ * [MANTTASKS-167] - Generated ant build file should save version list for version mapper
+
+** Improvement
+
+ * [MANTTASKS-117] - Setting Maven user-properties not possible
+
+ * [MANTTASKS-169] - Dependencies "verbose" option should be deprecated in favor of standard
ant verbose option
+
+** New Feature
+
+ * [MANTTASKS-151] - Support for artfacts that are 'classified' from birth
+
+ * [MANTTASKS-156] - Add feature to dependencies task to write file paths to a file.
+
+ * [MANTTASKS-168] - New task to write a pom file
+
+
* 2.0.10 Release Notes
The full list of changes can be found in our {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&pid=11533&fixfor=14199}issue
management system}}, and is reproduced below.