svn commit: r578895 - /maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MavenProjectInfoReportsPluginDependencyGraphTest.java
Author: joakime Date: Mon Sep 24 11:22:55 2007 New Revision: 578895 URL: http://svn.apache.org/viewvc?rev=578895view=rev Log: [MRM-469] Test failure in MavenProjectInfoReportsPluginDependencyGraphTest in archiva-dependency-graph Re-enabled Test Case. Modified: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MavenProjectInfoReportsPluginDependencyGraphTest.java Modified: maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MavenProjectInfoReportsPluginDependencyGraphTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MavenProjectInfoReportsPluginDependencyGraphTest.java?rev=578895r1=578894r2=578895view=diff == --- maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MavenProjectInfoReportsPluginDependencyGraphTest.java (original) +++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/MavenProjectInfoReportsPluginDependencyGraphTest.java Mon Sep 24 11:22:55 2007 @@ -134,7 +134,7 @@ expectedNodes.add( xerces:xmlParserAPIs:2.2.1::jar ); expectedNodes.add( xml-apis:xml-apis:1.0.b2::jar ); - //assertGraph( graph, expectedRootRef, expectedNodes ); + assertGraph( graph, expectedRootRef, expectedNodes ); } }
svn commit: r578897 - /maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java
Author: joakime
Date: Mon Sep 24 11:36:19 2007
New Revision: 578897
URL: http://svn.apache.org/viewvc?rev=578897view=rev
Log:
[MRM-486] Can not deploy artifact test.maven-arch:test-arch
Verifying that recent changes to DefaultBidirectionalLayout have fixed this
jira.
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java?rev=578897r1=578896r2=578897view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java
Mon Sep 24 11:36:19 2007
@@ -130,6 +130,22 @@
assertLayout( path, groupId, artifactId, version, classifier, type );
}
+
+/**
+ * [MRM-486] Can not deploy artifact test.maven-arch:test-arch due to No
ArtifactID Detected
+ */
+public void testGoodDashedArtifactId()
+throws LayoutException
+{
+String groupId = test.maven-arch;
+String artifactId = test-arch;
+String version = 2.0.3-SNAPSHOT;
+String classifier = null;
+String type = pom;
+String path =
test/maven-arch/test-arch/2.0.3-SNAPSHOT/test-arch-2.0.3-SNAPSHOT.pom;
+
+assertLayout( path, groupId, artifactId, version, classifier, type );
+}
public void testGoodComFooTool()
throws LayoutException
svn commit: r579016 - in /maven/archiva/trunk/archiva-web/archiva-webapp/src/main: java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java resources/xwork.xml
Author: joakime
Date: Mon Sep 24 16:16:50 2007
New Revision: 579016
URL: http://svn.apache.org/viewvc?rev=579016view=rev
Log:
[MRM-494] leaving repository ID blank on the add repository page goes to the
edit page where ID cannot be edited
Spliting webwork definition of INPUT into ADD/EDIT, and correcting validations.
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java?rev=579016r1=579015r2=579016view=diff
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
Mon Sep 24 16:16:50 2007
@@ -20,6 +20,7 @@
*/
import com.opensymphony.xwork.Preparable;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.Configuration;
@@ -32,9 +33,11 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
/**
- * Configures the application repositories.
+ * Configures the managed repositories.
*
* @plexus.component role=com.opensymphony.xwork.Action
role-hint=configureRepositoryAction
*/
@@ -52,6 +55,15 @@
*/
protected RoleManager roleManager;
+private static final ListString VALID_MODES;
+
+static
+{
+VALID_MODES = new ArrayListString();
+VALID_MODES.add( add );
+VALID_MODES.add( edit );
+}
+
public String add()
{
this.mode = add;
@@ -59,7 +71,7 @@
this.repository.setReleases( true );
this.repository.setScanned( true );
-return INPUT;
+return this.mode;
}
public String delete()
@@ -92,22 +104,22 @@
catch ( IOException e )
{
addActionError( Unable to delete repository: +
e.getMessage() );
-result = INPUT;
+result = ERROR;
}
catch ( RoleManagerException e )
{
addActionError( Unable to delete repository: +
e.getMessage() );
-result = INPUT;
+result = ERROR;
}
catch ( InvalidConfigurationException e )
{
addActionError( Unable to delete repository: +
e.getMessage() );
-result = INPUT;
+result = ERROR;
}
catch ( RegistryException e )
{
addActionError( Unable to delete repository: +
e.getMessage() );
-result = INPUT;
+result = ERROR;
}
}
@@ -136,25 +148,35 @@
public String save()
{
-String repoId = repository.getId();
+// Ensure a proper mode is set.
+if ( StringUtils.isBlank( this.mode ) )
+{
+addActionError( Unable to process save request. edit mode
undefined. );
+return ERROR;
+}
+
+if ( !VALID_MODES.contains( this.mode.toLowerCase() ) )
+{
+addActionError( Unable to process save request. edit mode is
invalid. );
+return ERROR;
+}
+// Ensure that the fields are valid.
Configuration configuration = archivaConfiguration.getConfiguration();
boolean containsError = validateFields( configuration );
-if ( containsError StringUtils.equalsIgnoreCase( add, mode ) )
-{
-return INPUT;
-}
-else if ( containsError StringUtils.equalsIgnoreCase( edit,
this.mode ) )
+if ( containsError )
{
-return ERROR;
+return this.mode.toLowerCase();
}
+// If we are in edit mode, then remove the old repository
configuration.
if ( StringUtils.equalsIgnoreCase( edit, this.mode ) )
{
-removeRepository( repoId, configuration );
+removeRepository( repository.getId(), configuration );
}
+// Save the repository configuration.
String result;
try
{
@@ -164,22 +186,22 @@
catch ( IOException e )
{
addActionError( I/O Exception: + e.getMessage() );
-result = INPUT;
+result = ERROR;
svn commit: r579036 - in /maven/archiva/trunk/archiva-web/archiva-webapp/src: main/java/org/apache/maven/archiva/web/action/admin/repositories/ main/resources/ main/webapp/WEB-INF/jsp/admin/ test/java
Author: brett
Date: Mon Sep 24 19:13:13 2007
New Revision: 579036
URL: http://svn.apache.org/viewvc?rev=579036view=rev
Log:
simplify the repository configuration pages
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java?rev=579036r1=579035r2=579036view=diff
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
Mon Sep 24 19:13:13 2007
@@ -19,12 +19,14 @@
* under the License.
*/
+import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import
org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
import org.apache.maven.archiva.configuration.InvalidConfigurationException;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.codehaus.plexus.redback.rbac.Resource;
+import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
@@ -36,34 +38,30 @@
/**
* Base class for repository configuration actions.
*/
-public class AbstractConfigureRepositoryAction
+public abstract class AbstractConfigureRepositoryActionT extends
AbstractRepositoryConfiguration
extends PlexusActionSupport
implements SecureAction
{
/**
+ * The model for this action.
+ */
+protected T repository;
+
+/**
* @plexus.requirement
*/
protected ArchivaConfiguration archivaConfiguration;
protected String repoid;
-// TODO: consider removing? was just meant to be for delete...
-protected String mode;
-
-// TODO: rename to confirmDelete
-public String confirm()
-{
-return INPUT;
-}
-
-public String getMode()
+public String getRepoid()
{
-return this.mode;
+return repoid;
}
-public String getRepoid()
+public T getRepository()
{
-return repoid;
+return repository;
}
public SecureActionBundle getSecureActionBundle()
@@ -77,11 +75,6 @@
return bundle;
}
-public void setMode( String mode )
-{
-this.mode = mode;
-}
-
public void setRepoid( String repoid )
{
this.repoid = repoid;
@@ -92,13 +85,6 @@
this.archivaConfiguration = archivaConfiguration;
}
-public String edit()
-{
-this.mode = edit;
-
-return INPUT;
-}
-
protected String saveConfiguration( Configuration configuration )
throws IOException, InvalidConfigurationException, RegistryException
{
@@ -110,9 +96,85 @@
catch (
svn commit: r578955 - /maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
Author: dennisl
Date: Mon Sep 24 13:40:14 2007
New Revision: 578955
URL: http://svn.apache.org/viewvc?rev=578955view=rev
Log:
o Replace Java 5 method call with StringUtils.
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java?rev=578955r1=578954r2=578955view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
Mon Sep 24 13:40:14 2007
@@ -185,8 +185,8 @@
for ( Iterator i = files.iterator(); i.hasNext(); )
{
ChangeFile file = (ChangeFile) i.next();
-String f1 = StringUtils.replace( file.getName(), \\, /
).replace( //, / );
-String f2 = StringUtils.replace( filename, \\, /
).replace( //, / );
+String f1 = StringUtils.replace( StringUtils.replace(
file.getName(), \\, / ), //, / );
+String f2 = StringUtils.replace( StringUtils.replace(
filename, \\, / ), //, / );
if ( f1.indexOf( f2 ) = 0 )
{
return true;
svn commit: r578991 - in /maven/scm/trunk: maven-scm-providers/ maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/ maven-scm-providers/maven-scm-providers-cvs/maven-scm-provid
Author: dennisl Date: Mon Sep 24 14:52:14 2007 New Revision: 578991 URL: http://svn.apache.org/viewvc?rev=578991view=rev Log: o Update scm dependencies to 1.1-SNAPSHOT. Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml maven/scm/trunk/maven-scm-providers/pom.xml maven/scm/trunk/maven-scm-test/pom.xml Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml?rev=578991r1=578990r2=578991view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/pom.xml Mon Sep 24 14:52:14 2007 @@ -53,7 +53,7 @@ dependency groupIdorg.apache.maven.scm/groupId artifactIdmaven-scm-provider-cvstest/artifactId - version1.0/version + version1.1-SNAPSHOT/version scopetest/scope /dependency /dependencies Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml?rev=578991r1=578990r2=578991view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml Mon Sep 24 14:52:14 2007 @@ -31,13 +31,13 @@ dependency groupIdorg.apache.maven.scm/groupId artifactIdmaven-scm-provider-cvstest/artifactId - version1.0/version + version1.1-SNAPSHOT/version scopetest/scope /dependency dependency groupIdorg.apache.maven.scm/groupId artifactIdmaven-scm-provider-cvs-commons/artifactId - version1.0/version + version1.1-SNAPSHOT/version /dependency /dependencies Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml?rev=578991r1=578990r2=578991view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml Mon Sep 24 14:52:14 2007 @@ -31,7 +31,7 @@ dependency groupIdorg.apache.maven.scm/groupId artifactIdmaven-scm-provider-cvs-commons/artifactId - version1.0/version + version1.1-SNAPSHOT/version /dependency dependency groupIdorg.netbeans.lib/groupId @@ -46,7 +46,7 @@ dependency groupIdorg.apache.maven.scm/groupId artifactIdmaven-scm-provider-cvstest/artifactId - version1.0/version + version1.1-SNAPSHOT/version scopetest/scope /dependency /dependencies Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml?rev=578991r1=578990r2=578991view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest/pom.xml Mon Sep 24 14:52:14 2007 @@ -31,7 +31,7 @@ dependency groupIdorg.apache.maven.scm/groupId artifactIdmaven-scm-test/artifactId - version1.0/version + version1.1-SNAPSHOT/version /dependency /dependencies /project Modified: maven/scm/trunk/maven-scm-providers/pom.xml URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/pom.xml?rev=578991r1=578990r2=578991view=diff == --- maven/scm/trunk/maven-scm-providers/pom.xml (original) +++ maven/scm/trunk/maven-scm-providers/pom.xml Mon Sep 24 14:52:14 2007 @@ -44,12 +44,12 @@ dependency groupIdorg.apache.maven.scm/groupId
svn commit: r578669 - in /maven/sandbox/trunk/archetypeng/archetype-plugin/src/main: java/org/apache/maven/archetype/mojos/ resources/META-INF/maven/
Author: jvanzyl
Date: Sun Sep 23 23:11:46 2007
New Revision: 578669
URL: http://svn.apache.org/viewvc?rev=578669view=rev
Log:
o remove the lifecycle from the project to archetype mojo
o remove all the mojos that made up the lifecycle now that we are running a
sequence of calls
to archetype itself.
Removed:
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureCreationMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureGenerationMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/GenerateProjectMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/SelectArchetypeMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/resources/META-INF/maven/
Modified:
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
Modified:
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java?rev=578669r1=578668r2=578669view=diff
==
---
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java
Sun Sep 23 23:11:46 2007
@@ -84,7 +84,6 @@
{
if ( goalPrefix == null )
{
-//goalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId(
project.getArtifactId () );
goalPrefix = project.getArtifactId();
}
Modified:
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=578669r1=578668r2=578669view=diff
==
---
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
Sun Sep 23 23:11:46 2007
@@ -22,30 +22,164 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.archetype.common.ArchetypeRegistryManager;
+import org.apache.maven.archetype.creator.ArchetypeCreationConfigurator;
+import org.apache.maven.archetype.creator.ArchetypeCreator;
+import org.apache.maven.project.MavenProject;
+
+import java.util.List;
+import java.io.File;
/**
* Creates sample archetype from current project.
- * It delegates to the two mojos of the create lifecycle: configure-creation,
create-archetype
*
* @author rafale
* @requiresProject true
* @goal create-from-project
- * @execute phase=generate-sources lifecycle=create
+ * @execute phase=generate-sources
*/
public class CreateArchetypeFromProjectMojo
extends AbstractMojo
{
+/** @component */
+ArchetypeCreationConfigurator configurator;
+
+/**
+ * Enable the interactive mode to define the archetype from the project.
+ *
+ * @parameter expression=${interactive} default-value=false
+ */
+private boolean interactive;
+
+/** @component */
+ArchetypeRegistryManager archetypeRegistryManager;
+
+/** @component role-hint=fileset */
+ArchetypeCreator creator;
+
+/**
+ * File extensions which are checked for project's text files (vs binary
files).
+ *
+ * @parameter expression=${archetype.filteredExtentions}
+ */
+private String archetypeFilteredExtentions;
+
+/**
+ * Directory names which are checked for project's sources main package.
+ *
+ * @parameter expression=${archetype.languages}
+ */
+private String archetypeLanguages;
+
+
svn commit: r578634 - /maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Author: rgoers
Date: Sun Sep 23 20:18:36 2007
New Revision: 578634
URL: http://svn.apache.org/viewvc?rev=578634view=rev
Log:
Fix subheading.
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt?rev=578634r1=578633r2=578634view=diff
==
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Sun Sep 23 20:18:36 2007
@@ -389,6 +389,7 @@
The reference information about the dependency management tags is available
from the
{{{../../ref/current/maven-model/maven.html#class_DependencyManagement}project
descriptor reference}}.
+
** Importing Dependencies
The features defined in this section are only available in maven 2.0.8 or
later.
svn commit: r578553 - in /maven: artifact/trunk/src/main/java/org/apache/maven/artifact/ components/trunk/maven-project/src/main/java/org/apache/maven/project/ components/trunk/maven-project/src/test/
Author: rgoers Date: Sun Sep 23 00:20:24 2007 New Revision: 578553 URL: http://svn.apache.org/viewvc?rev=578553view=rev Log: Allow the managed dependencies of projects to be imported into the managed dependencies of other projects. Added: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/imports/ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/imports/t01/ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java maven/components/trunk/maven-project/src/test/resources/imports-repo/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p1/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml (with props) maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p2/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p2/pom.xml (with props) maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p3/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p3/pom.xml (with props) maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p4/ maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/p4/pom.xml (with props) maven/components/trunk/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml (with props) Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java?rev=578553r1=578552r2=578553view=diff == --- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java (original) +++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java Sun Sep 23 00:20:24 2007 @@ -58,6 +58,8 @@ String SCOPE_SYSTEM = system; +String SCOPE_IMPORT = import; // Used to import dependencyManagement dependencies +
svn commit: r578552 - in /maven/components/branches/maven-2.0.x/maven-project/src/test: java/org/apache/maven/project/imports/ java/org/apache/maven/project/imports/t01/ resources/imports-repo/t01/p0/
Author: rgoers
Date: Sat Sep 22 23:46:25 2007
New Revision: 578552
URL: http://svn.apache.org/viewvc?rev=578552view=rev
Log:
Remove Windows line feeds.
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java?rev=578552r1=578551r2=578552view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
Sat Sep 22 23:46:25 2007
@@ -1,53 +1,53 @@
-package org.apache.maven.project.imports;
-
-/*
- * 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.project.AbstractMavenProjectTestCase;
-
-import java.io.File;
-
-/**
- * @author a href=mailto:[EMAIL PROTECTED]Jason van Zyl/a
- * @version $Id: AbstractProjectInheritanceTestCase.java 495147 2007-01-11
07:47:53Z jvanzyl $
- */
-public abstract class AbstractProjectImportsTestCase
-extends AbstractMavenProjectTestCase
-{
-protected String getTestSeries()
-{
-String className = getClass().getPackage().getName();
-
-return className.substring( className.lastIndexOf( . ) + 1 );
-}
-
-protected File projectFile( String name )
-{
-return new File( getLocalRepositoryPath(), /maven/poms/ + name +
-1.0.pom );
-}
-
-// --
-// The local repository for this category of tests
-// --
-
-protected File getLocalRepositoryPath()
-{
-return getTestFile( src/test/resources/imports-repo/ +
getTestSeries() );
-}
-}
+package org.apache.maven.project.imports;
+
+/*
+ * 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.project.AbstractMavenProjectTestCase;
+
+import java.io.File;
+
+/**
+ * @author a href=mailto:[EMAIL PROTECTED]Jason van Zyl/a
+ * @version $Id: AbstractProjectInheritanceTestCase.java 495147 2007-01-11
07:47:53Z jvanzyl $
+ */
+public abstract class AbstractProjectImportsTestCase
+extends AbstractMavenProjectTestCase
+{
+protected String getTestSeries()
+{
+String className = getClass().getPackage().getName();
+
+return className.substring( className.lastIndexOf( . ) + 1 );
+}
+
+protected File projectFile( String name )
+{
+return new File( getLocalRepositoryPath(), /maven/poms/ + name +
-1.0.pom );
+}
+
+// --
+// The
svn commit: r578551 - in /maven/components/branches/maven-2.0.x: maven-artifact/src/main/java/org/apache/maven/artifact/ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/test/ja
Author: rgoers Date: Sat Sep 22 22:54:20 2007 New Revision: 578551 URL: http://svn.apache.org/viewvc?rev=578551view=rev Log: Allow the managed depdendenies in projects to be imported into the managed dependencies of other projects. Added: maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/ maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/t01/ maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/imports/t01/ProjectImportsTest.java maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p1/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p2/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p2/pom.xml maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p3/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p3/pom.xml maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p4/ maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/p4/pom.xml maven/components/branches/maven-2.0.x/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java URL:
svn commit: r578699 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brett Date: Mon Sep 24 01:10:07 2007 New Revision: 578699 URL: http://svn.apache.org/viewvc?rev=578699view=rev Log: use an existing site plugin snapshot Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=578699r1=578698r2=578699view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Mon Sep 24 01:10:07 2007 @@ -288,7 +288,7 @@ dependency groupIdorg.apache.maven.plugins/groupId artifactIdmaven-site-plugin/artifactId - version2.0-SNAPSHOT/version + version2.0-beta-6-SNAPSHOT/version /dependency /dependencies
svn commit: r578710 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml
Author: brett Date: Mon Sep 24 01:43:16 2007 New Revision: 578710 URL: http://svn.apache.org/viewvc?rev=578710view=rev Log: lockdown Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml?rev=578710r1=578709r2=578710view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml Mon Sep 24 01:43:16 2007 @@ -18,6 +18,7 @@ plugins plugin artifactIdmaven-dependency-plugin/artifactId +version2.0-beta-4/version executions execution idunpack/id
svn commit: r578716 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml
Author: brett Date: Mon Sep 24 02:07:14 2007 New Revision: 578716 URL: http://svn.apache.org/viewvc?rev=578716view=rev Log: fat fingered the version Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml?rev=578716r1=578715r2=578716view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml Mon Sep 24 02:07:14 2007 @@ -18,7 +18,7 @@ plugins plugin artifactIdmaven-dependency-plugin/artifactId -version2.0-beta-4/version +version2.0-alpha-4/version executions execution idunpack/id
svn commit: r578717 - in /maven/sandbox/trunk/archetypeng: archetype-common/src/main/java/org/apache/maven/archetype/ archetype-common/src/main/java/org/apache/maven/archetype/common/ archetype-common
Author: jvanzyl
Date: Mon Sep 24 02:11:57 2007
New Revision: 578717
URL: http://svn.apache.org/viewvc?rev=578717view=rev
Log:
o sketching out the embedded use of the archetype and focusing on the two tasks
of generation from archetype and creation
from projects, decoupling the information gathering from the processes and
moving toward the elimination of
properties for sharing information and the use the request/result pattern we
have for embedding.
Added:
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java
(with props)
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
(with props)
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationResult.java
(with props)
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCriteria.java
(with props)
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
(with props)
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationResult.java
(with props)
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeSource.java
(with props)
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
(with props)
Removed:
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddGroupsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddRepositoriesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/RemoveGroupsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/RemoveRepositoriesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/ShowGroupsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/ShowRepositoriesMojo.java
Modified:
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFactory.java
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
maven/sandbox/trunk/archetypeng/archetype-common/src/main/mdo/archetype-registry.mdo
maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/ArchetypeGenerator.java
maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/ArchetypeSelector.java
maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeSelector.java
maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
Added:
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java?rev=578717view=auto
==
---
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java
(added)
+++
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/Archetype.java
Mon Sep 24 02:11:57 2007
@@ -0,0 +1,11 @@
+package org.apache.maven.archetype;
+
+/** @author Jason van Zyl */
+public interface Archetype
+{
+String ROLE = Archetype.class.getName();
+
+ArchetypeCreationResult createArchetypeFromProject(
ArchetypeCreationRequest request );
+
+ArchetypeGenerationResult generateProjectFromArchetype(
ArchetypeGenerationRequest request );
+}
Propchange:
svn commit: r578766 - in /maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site: apt/examples/resolving-conflicts-using-the-dependency-tree.apt site.xml
Author: markh Date: Mon Sep 24 04:32:38 2007 New Revision: 578766 URL: http://svn.apache.org/viewvc?rev=578766view=rev Log: Added an example of resolving conflicts using the dependency tree to the site. Added: maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/apt/examples/resolving-conflicts-using-the-dependency-tree.apt (with props) Modified: maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/site.xml Added: maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/apt/examples/resolving-conflicts-using-the-dependency-tree.apt URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/apt/examples/resolving-conflicts-using-the-dependency-tree.apt?rev=578766view=auto == --- maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/apt/examples/resolving-conflicts-using-the-dependency-tree.apt (added) +++ maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/apt/examples/resolving-conflicts-using-the-dependency-tree.apt Mon Sep 24 04:32:38 2007 @@ -0,0 +1,55 @@ +~~ 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. + + -- + Resolving conflicts using the dependency tree + -- + Mark Hobson + -- + Sep 2007 + -- + +Resolving conflicts using the dependency tree + + A project's dependency tree can be expanded to display dependency conflicts. For example, to find out why Commons + Collections 2.0 is being used by the Maven Dependency Plugin, we can execute the following in the project's + directory: + ++---+ +mvn dependency:tree -Dverbose -Dincludes=commons-collections ++---+ + + The verbose flag instructs the dependency tree to display conflicting dependencies that were omitted from the + resolved dependency tree. In this case, the goal outputs: + ++---+ +[INFO] [dependency:tree] +[INFO] org.apache.maven.plugins:maven-dependency-plugin:maven-plugin:2.0-alpha-5-SNAPSHOT +[INFO] +- org.apache.maven.reporting:maven-reporting-impl:jar:2.0.4:compile +[INFO] | \- commons-validator:commons-validator:jar:1.2.0:compile +[INFO] | \- commons-digester:commons-digester:jar:1.6:compile +[INFO] |\- (commons-collections:commons-collections:jar:2.1:compile - omitted for conflict with 2.0) +[INFO] \- org.apache.maven.doxia:doxia-site-renderer:jar:1.0-alpha-8:compile +[INFO]\- org.codehaus.plexus:plexus-velocity:jar:1.1.3:compile +[INFO] \- commons-collections:commons-collections:jar:2.0:compile ++---+ + + Thus we can see that Commons Collections 2.0 was chosen over 2.1 since it is nearer, and by default Maven resolves + version conflicts with a nearest-wins strategy. + + More specifically, in verbose mode the dependency tree shows dependencies that were omitted for: being a duplicate + of another; conflicting with another's version and/or scope; and introducing a cycle into the dependency tree. \ No newline at end of file Propchange: maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/apt/examples/resolving-conflicts-using-the-dependency-tree.apt -- svn:eol-style = native Propchange: maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/apt/examples/resolving-conflicts-using-the-dependency-tree.apt -- svn:keywords = Author Date Id Revision Modified: maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/site.xml?rev=578766r1=578765r2=578766view=diff == --- maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/site.xml (original) +++ maven/plugins/branches/maven-dependency-plugin-MDEP-100/src/site/site.xml Mon Sep 24 04:32:38 2007 @@ -35,6 +35,7 @@ item name=Unpacking the project dependencies href=examples/unpacking-project-dependencies.html / item name=Failing the build on
svn commit: r578775 - /maven/sandbox/trunk/doxia/doxia-module-fo/
Author: ltheussl Date: Mon Sep 24 05:09:36 2007 New Revision: 578775 URL: http://svn.apache.org/viewvc?rev=578775view=rev Log: Promote the fo module: http://www.nabble.com/-vote--promote-doxia-module-fo-tf4488008s177.html Removed: maven/sandbox/trunk/doxia/doxia-module-fo/
svn commit: r578790 - in /maven/components/branches/maven-2.0.x: maven-core-it-runner/ maven-core-it-runner/pom.xml pom.xml
Author: brett
Date: Mon Sep 24 05:32:41 2007
New Revision: 578790
URL: http://svn.apache.org/viewvc?rev=578790view=rev
Log:
add in the integration test runner for 2.0.x
Added:
maven/components/branches/maven-2.0.x/maven-core-it-runner/
- copied from r578654, maven/components/trunk/maven-core-it-runner/
Modified:
maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml
maven/components/branches/maven-2.0.x/pom.xml
Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=578790r1=578654r2=578790view=diff
==
--- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml
(original)
+++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Mon Sep
24 05:32:41 2007
@@ -23,15 +23,15 @@
parent
artifactIdmaven/artifactId
groupIdorg.apache.maven/groupId
-version2.1-SNAPSHOT/version
+version2.0.8-SNAPSHOT/version
/parent
artifactIdmaven-core-it-runner/artifactId
nameIntegration Test Executor/name
dependencies
dependency
groupIdorg.apache.maven/groupId
- artifactIdmaven-embedder/artifactId
- version2.1-SNAPSHOT/version
+ artifactIdmaven-core/artifactId
+ version2.0.8-SNAPSHOT/version
classifierbin/classifier
typetar.gz/type
/dependency
@@ -68,7 +68,7 @@
artifactItems
artifactItem
groupIdorg.apache.maven/groupId
- artifactIdmaven-embedder/artifactId
+ artifactIdmaven-core/artifactId
version${project.version}/version
classifierbin/classifier
typetar.gz/type
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=578790r1=578789r2=578790view=diff
==
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Mon Sep 24 05:32:41 2007
@@ -290,5 +290,11 @@
/plugins
/build
/profile
+profile
+ idrun-its/id
+ modules
+modulemaven-core-it-runner/module
+ /modules
+/profile
/profiles
/project
svn commit: r578791 - in /maven/sandbox/trunk/plugins/maven-linkcheck-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/jav
Author: vsiveton Date: Mon Sep 24 05:32:42 2007 New Revision: 578791 URL: http://svn.apache.org/viewvc?rev=578791view=rev Log: o first import of a linkcheck report o added a maven report o added documentation o TODO: - add test cases - execute the report in the post-site phase Added: maven/sandbox/trunk/plugins/maven-linkcheck-plugin/ (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/pom.xml (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/resources/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/resources/linkcheck-report.properties (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/apt/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/apt/index.apt (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/apt/limitations.apt (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/apt/usage.apt (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/resources/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/resources/images/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/resources/images/sample.png (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/site/site.xml (with props) maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/test/ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/test/java/ Propchange: maven/sandbox/trunk/plugins/maven-linkcheck-plugin/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 24 05:32:42 2007 @@ -0,0 +1,7 @@ +target +.classpath +.project +maven-pdf-plugin.iml +maven-pdf-plugin.ipr +maven-pdf-plugin.iws +.settings Added: maven/sandbox/trunk/plugins/maven-linkcheck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-linkcheck-plugin/pom.xml?rev=578791view=auto == --- maven/sandbox/trunk/plugins/maven-linkcheck-plugin/pom.xml (added) +++ maven/sandbox/trunk/plugins/maven-linkcheck-plugin/pom.xml Mon Sep 24 05:32:42 2007 @@ -0,0 +1,105 @@ +?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; + modelVersion4.0.0/modelVersion + parent +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-plugins/artifactId +version8/version + /parent + + prerequisites +maven2.0.4/maven + /prerequisites + + artifactIdmaven-linkcheck-plugin/artifactId + packagingmaven-plugin/packaging + nameMaven Linkcheck Plugin/name + version1.0-SNAPSHOT/version + + developers +developer + idvsiveton/id + nameVincent Siveton/name + email[EMAIL PROTECTED]/email + organizationApache Software Foundation/organization + roles + roleJava Developer/role + /roles + timezone-5/timezone +/developer + /developers + + dependencies +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-plugin-api/artifactId + version2.0.4/version + exclusions +!-- Using org.codehaus.plexus:plexus-utils
svn commit: r578801 - /maven/components/branches/maven-2.0.x/ci.sh
Author: brett Date: Mon Sep 24 06:16:28 2007 New Revision: 578801 URL: http://svn.apache.org/viewvc?rev=578801view=rev Log: so long ci.sh Removed: maven/components/branches/maven-2.0.x/ci.sh
svn commit: r578817 - /maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Author: ltheussl
Date: Mon Sep 24 07:11:32 2007
New Revision: 578817
URL: http://svn.apache.org/viewvc?rev=578817view=rev
Log:
Adjust to changes in fo module. Use pdf bookmarks.
Modified:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Modified:
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java?rev=578817r1=578816r2=578817view=diff
==
---
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
(original)
+++
maven/sandbox/trunk/plugins/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/renderer/DefaultPdfRenderer.java
Mon Sep 24 07:11:32 2007
@@ -212,11 +212,13 @@
FoAggregateSink sink = new FoAggregateSink( new FileWriter(
outputFOFile ) );
+sink.setDocumentModel( documentModel );
+
sink.beginDocument();
-sink.coverPage( documentModel.getMeta() );
+sink.coverPage();
-sink.toc( documentModel.getToc() );
+sink.toc();
for ( Iterator k = documentModel.getToc().getItems().iterator();
k.hasNext(); )
{
svn commit: r578830 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml
Author: brett
Date: Mon Sep 24 07:30:39 2007
New Revision: 578830
URL: http://svn.apache.org/viewvc?rev=578830view=rev
Log:
propogate the maven.home property for the invoker
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=578830r1=578829r2=578830view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Mon Sep 24 07:30:39 2007
@@ -120,6 +120,12 @@
configuration
!-- Need of more head space in order to run the unit tests !--
argLine-Xmx256m/argLine
+ systemProperties
+property
+ namemaven.home/name
+ value${maven.home}/value
+/property
+ /systemProperties
/configuration
/plugin
/plugins
svn commit: r578837 - /maven/components/branches/maven-2.0.x/maven-core/pom.xml
Author: brett
Date: Mon Sep 24 07:39:35 2007
New Revision: 578837
URL: http://svn.apache.org/viewvc?rev=578837view=rev
Log:
flip the order so it builds properly
Modified:
maven/components/branches/maven-2.0.x/maven-core/pom.xml
Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=578837r1=578836r2=578837view=diff
==
--- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Mon Sep 24
07:39:35 2007
@@ -32,21 +32,6 @@
build
plugins
plugin
-artifactIdmaven-assembly-plugin/artifactId
-configuration
- descriptorsrc/assemble/bin.xml/descriptor
- finalNameapache-maven-${version}/finalName
-/configuration
-executions
- execution
-phasepackage/phase
-goals
- goalsingle/goal
-/goals
- /execution
-/executions
- /plugin
- plugin
artifactIdshade-maven-plugin/artifactId
groupIdorg.codehaus.mojo/groupId
version1.0-alpha-4/version
@@ -75,6 +60,22 @@
/relocation
/relocations
/configuration
+ /execution
+/executions
+ /plugin
+ plugin
+artifactIdmaven-assembly-plugin/artifactId
+version2.1/version
+configuration
+ descriptorsrc/assemble/bin.xml/descriptor
+ finalNameapache-maven-${version}/finalName
+/configuration
+executions
+ execution
+phasepackage/phase
+goals
+ goalsingle/goal
+/goals
/execution
/executions
/plugin
svn commit: r578846 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Author: brett Date: Mon Sep 24 08:03:09 2007 New Revision: 578846 URL: http://svn.apache.org/viewvc?rev=578846view=rev Log: test is failing in 2.0.7 / 2.0.8-SNAPSHOT Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=578846r1=578845r2=578846view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Mon Sep 24 08:03:09 2007 @@ -181,7 +181,7 @@ // 2.0.7 only (TODO: detect what version is used before running them) suite.addTestSuite( MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.class ); suite.addTestSuite( MavenIT0119PluginPrefixOrder.class ); -suite.addTestSuite( MavenIT0120EjbClientDependency.class ); +// suite.addTestSuite( MavenIT0120EjbClientDependency.class ); -- not passing for 2.0.7 either, looks to be 2.1+ ? return suite; } }
svn commit: r578890 - /maven/sandbox/trunk/doxia/pom.xml
Author: ltheussl Date: Mon Sep 24 10:54:03 2007 New Revision: 578890 URL: http://svn.apache.org/viewvc?rev=578890view=rev Log: Remove fo from modules Modified: maven/sandbox/trunk/doxia/pom.xml Modified: maven/sandbox/trunk/doxia/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/pom.xml?rev=578890r1=578889r2=578890view=diff == --- maven/sandbox/trunk/doxia/pom.xml (original) +++ maven/sandbox/trunk/doxia/pom.xml Mon Sep 24 10:54:03 2007 @@ -33,7 +33,6 @@ modules moduledoxia-editor/module moduledoxia-linkcheck/module -moduledoxia-module-fo/module moduledoxia-module-mediawiki/module /modules /project
svn commit: r578892 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Mon Sep 24 10:59:20 2007 New Revision: 578892 URL: http://svn.apache.org/viewvc?rev=578892view=rev Log: o Use released versions of doxia. Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=578892r1=578891r2=578892view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Mon Sep 24 10:59:20 2007 @@ -127,8 +127,8 @@ /contributor /contributors properties -doxiaVersion1.0-alpha-9-SNAPSHOT/doxiaVersion -doxiaSitetoolsVersion1.0-alpha-9-SNAPSHOT/doxiaSitetoolsVersion +doxiaVersion1.0-alpha-9/doxiaVersion +doxiaSitetoolsVersion1.0-alpha-9/doxiaSitetoolsVersion /properties dependencies dependency
svn commit: r578894 - /maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexCreationTestCase.java
Author: joakime
Date: Mon Sep 24 11:21:35 2007
New Revision: 578894
URL: http://svn.apache.org/viewvc?rev=578894view=rev
Log:
[MRM-470] Test failures in BytecodeIndexTest due to NPE in
AbstractIndexCreationTestCase
Re-enabled test cases.
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexCreationTestCase.java
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexCreationTestCase.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexCreationTestCase.java?rev=578894r1=578893r2=578894view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexCreationTestCase.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexCreationTestCase.java
Mon Sep 24 11:21:35 2007
@@ -71,7 +71,6 @@
}
}
-/*
public void testAddRecordNoIndex() throws IOException,
RepositoryIndexException, ParseException
{
LuceneRepositoryContentRecord record = createSimpleRecord();
@@ -158,7 +157,6 @@
reader.close();
}
}
-*/
public void testDeleteRecordNotInIndex() throws IOException,
RepositoryIndexException
{
svn commit: r578956 - /maven/plugins/trunk/maven-gpg-plugin/pom.xml
Author: dkulp Date: Mon Sep 24 13:41:47 2007 New Revision: 578956 URL: http://svn.apache.org/viewvc?rev=578956view=rev Log: [maven-release-plugin] prepare release maven-gpg-plugin-1.0-alpha-4 Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/pom.xml?rev=578956r1=578955r2=578956view=diff == --- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Mon Sep 24 13:41:47 2007 @@ -7,7 +7,7 @@ modelVersion4.0.0/modelVersion artifactIdmaven-gpg-plugin/artifactId packagingmaven-plugin/packaging - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-4/version nameMaven GPG Plugin/name prerequisites maven2.0.5/maven @@ -66,4 +66,10 @@ scopetest/scope /dependency /dependencies + + scm + connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4/developerConnection + urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4/url + /scm /project
svn commit: r578957 - in /maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4: ./ pom.xml
Author: dkulp Date: Mon Sep 24 13:41:51 2007 New Revision: 578957 URL: http://svn.apache.org/viewvc?rev=578957view=rev Log: [maven-scm] copy for tag maven-gpg-plugin-1.0-alpha-4 Added: maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4/ - copied from r578953, maven/plugins/trunk/maven-gpg-plugin/ maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4/pom.xml - copied unchanged from r578956, maven/plugins/trunk/maven-gpg-plugin/pom.xml
svn commit: r578958 - /maven/plugins/trunk/maven-gpg-plugin/pom.xml
Author: dkulp Date: Mon Sep 24 13:42:12 2007 New Revision: 578958 URL: http://svn.apache.org/viewvc?rev=578958view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/pom.xml?rev=578958r1=578957r2=578958view=diff == --- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Mon Sep 24 13:42:12 2007 @@ -7,7 +7,7 @@ modelVersion4.0.0/modelVersion artifactIdmaven-gpg-plugin/artifactId packagingmaven-plugin/packaging - version1.0-alpha-4/version + version1.0-alpha-5-SNAPSHOT/version nameMaven GPG Plugin/name prerequisites maven2.0.5/maven @@ -66,10 +66,4 @@ scopetest/scope /dependency /dependencies - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-gpg-plugin-1.0-alpha-4/url - /scm /project
svn commit: r579028 - /maven/components/branches/MNG-3220/
Author: rgoers Date: Mon Sep 24 18:25:34 2007 New Revision: 579028 URL: http://svn.apache.org/viewvc?rev=579028view=rev Log: Create branch for work on MNG-3220 Added: maven/components/branches/MNG-3220/ - copied from r578553, maven/components/branches/maven-2.0.x/
svn commit: r579029 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/site/apt/index.apt src/site/apt/usage.apt
Author: brianf Date: Mon Sep 24 18:29:32 2007 New Revision: 579029 URL: http://svn.apache.org/viewvc?rev=579029view=rev Log: site updates. prepare dependencies for release Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=579029r1=579028r2=579029view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Mon Sep 24 18:29:32 2007 @@ -1,329 +1,311 @@ 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; -!-- - * 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. - * + !-- +* 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. +* -- - modelVersion4.0.0/modelVersion - parent -artifactIdmaven-plugins/artifactId -groupIdorg.apache.maven.plugins/groupId -version8/version - /parent - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-dependency-plugin/artifactId - packagingmaven-plugin/packaging - nameMaven Dependency Plugin/name - version2.0-alpha-5-SNAPSHOT/version - prerequisites -maven2.0.3/maven - /prerequisites - issueManagement -systemJIRA/system -urlhttp://jira.codehaus.org/browse/MDEP/url - /issueManagement - developers -developer - idbrianf/id - nameBrian Fox/name - email[EMAIL PROTECTED]/email - roles -roleLead Developer/role - /roles - timezone5/timezone -/developer -developer - iddtran/id - nameDan T. Tran/name - email[EMAIL PROTECTED]/email - organization - /organization - roles -roleDeveloper/role - /roles -/developer -developer - idjdcasey/id - nameJohn Casey/name - email[EMAIL PROTECTED]/email - organization - /organization - roles -roleDeveloper/role - /roles -/developer - /developers - licenses -license - nameApache License 2.0/name - urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url - distributionrepo/distribution -/license - /licenses - build -plugins - plugin -artifactIdmaven-enforcer-plugin/artifactId -version1.0-alpha-3/version -executions - execution -goals - goalenforce/goal -/goals -idensure-no-container-api/id -configuration - rules -bannedDependencies - excludes -excludeorg.codehaus.plexus:plexus-component-api/exclude - /excludes - messageThe new containers are not supported. You probably added a dependency that is missing the exclusions./message -/bannedDependencies - /rules - failtrue/fail -/configuration - /execution -/executions - /plugin - plugin -groupIdorg.codehaus.mojo/groupId -artifactIdcobertura-maven-plugin/artifactId -version2.0/version -executions -
