svn commit: r329821 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: evenisse
Date: Mon Oct 31 06:20:38 2005
New Revision: 329821
URL: http://svn.apache.org/viewcvs?rev=329821view=rev
Log:
Show validation error message in debug mode
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=329821r1=329820r2=329821view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Mon Oct 31 06:20:38 2005
@@ -41,6 +41,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.validation.ModelValidationResult;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
@@ -106,6 +107,20 @@
getLogger().warn( POM for: \' + pomArtifact +
\' does not appear to be valid. Its will be ignored
for artifact resolution.\n\nReason: +
e.getMessage() + \n\n );
+
+if ( getLogger().isDebugEnabled() )
+{
+ModelValidationResult validationResult =
e.getValidationResult();
+
+if ( validationResult != null )
+{
+for ( Iterator i =
validationResult.getMessages().iterator(); i.hasNext(); )
+{
+getLogger().debug( i.next().toString() );
+}
+getLogger().debug( \n\n );
+}
+}
project = null;
}
svn commit: r329838 [2/2] - in /maven/components/trunk/maven-plugins/maven-eclipse-plugin: ./ src/test/java/org/apache/maven/plugin/eclipse/ src/test/m2repo/ src/test/m2repo/eclipsetest/ src/test/m2re
Added: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/pom.xml?rev=329838view=auto == --- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/pom.xml (added) +++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/pom.xml Mon Oct 31 07:21:32 2005 @@ -0,0 +1,14 @@ +?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; + modelVersion4.0.0/modelVersion + packagingpom/packaging + groupIdeclipsetest/groupId + artifactIdmaster-test/artifactId + version1.0/version + namemaster/name + modules +modulemodule-1/module +modulemodule-2/module + /modules +/project Propchange: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/pom.xml -- svn:eol-style = native Propchange: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/pom.xml -- svn:keywords = Author Date Id Revision Propchange: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/project-8/ -- --- svn:ignore (added) +++ svn:ignore Mon Oct 31 07:21:32 2005 @@ -0,0 +1,4 @@ +.classpath +.project +.wtpmodules +target
svn commit: r329840 - in /maven/maven-1/plugins/trunk/scm/xdocs: changes.xml navigation.xml
Author: aheritier Date: Mon Oct 31 07:40:35 2005 New Revision: 329840 URL: http://svn.apache.org/viewcvs?rev=329840view=rev Log: MPSCM-57 (Fixed by Lukas) : Re-add changes.xml file to display announcements. Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml maven/maven-1/plugins/trunk/scm/xdocs/navigation.xml Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/changes.xml?rev=329840r1=329839r2=329840view=diff == --- maven/maven-1/plugins/trunk/scm/xdocs/changes.xml (original) +++ maven/maven-1/plugins/trunk/scm/xdocs/changes.xml Mon Oct 31 07:40:35 2005 @@ -25,6 +25,7 @@ /properties body release version=1.6-SNAPSHOT date=in SVN + action dev=ltheussl type=fix issue=MPSCM-57Re-add changes.xml file to display announcements./action action dev=aheritier type=update issue=MPSCM-66Update to released version of maven-scm./action action dev=brett type=add issue=MPSCM-47,MPSCM-54New scm:checkin goal./action action dev=evenisse type=add issue=MPSCM-56Add Starteam support, plus scm:add, scm:status, scm:checkin./action Modified: maven/maven-1/plugins/trunk/scm/xdocs/navigation.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/navigation.xml?rev=329840r1=329839r2=329840view=diff == --- maven/maven-1/plugins/trunk/scm/xdocs/navigation.xml (original) +++ maven/maven-1/plugins/trunk/scm/xdocs/navigation.xml Mon Oct 31 07:40:35 2005 @@ -31,6 +31,9 @@ item name=Maven 2.0 href=http://maven.apache.org// /links menu name=User Guide + item href=/index.html name=About/ + item href=/downloads.html name=Downloads/ + item href=/changes-report.html name=Plugin Changelog/ item href=/commontasks.html name=Common Tasks/ item href=/releasing.html name=Making Releases/ /menu
svn commit: r329864 - /maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWtpmodulesWriter.java
Author: fgiust
Date: Mon Oct 31 09:12:13 2005
New Revision: 329864
URL: http://svn.apache.org/viewcvs?rev=329864view=rev
Log:
don't add dependencies with scope=provided to wtpmodules
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWtpmodulesWriter.java
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWtpmodulesWriter.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWtpmodulesWriter.java?rev=329864r1=329863r2=329864view=diff
==
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWtpmodulesWriter.java
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseWtpmodulesWriter.java
Mon Oct 31 09:12:13 2005
@@ -198,7 +198,8 @@
Artifact artifact = (Artifact) it.next();
String type = artifact.getType();
-if ( jar.equals( type ) || ejb.equals( type ) ||
ejb-client.equals( type ) )
+if ( jar.equals( type ) || ejb.equals( type ) ||
ejb-client.equals( type )
+ !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) )
{
addDependency( writer, artifact, referencedReactorArtifacts,
localRepository );
}
svn commit: r329865 - in /maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest: direct-compile/1.0/direct-compile-1.0.pom refproject-compile/1.0/refproject-compile-1.0
Author: fgiust Date: Mon Oct 31 09:24:10 2005 New Revision: 329865 URL: http://svn.apache.org/viewcvs?rev=329865view=rev Log: fix wrong test poms Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/direct-compile/1.0/direct-compile-1.0.pom maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.pom Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/direct-compile/1.0/direct-compile-1.0.pom URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/direct-compile/1.0/direct-compile-1.0.pom?rev=329865r1=329864r2=329865view=diff == --- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/direct-compile/1.0/direct-compile-1.0.pom (original) +++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/direct-compile/1.0/direct-compile-1.0.pom Mon Oct 31 09:24:10 2005 @@ -1,4 +1,5 @@ -project +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 groupIdeclipsetest/groupId artifactIddirect-compile/artifactId @@ -6,27 +7,29 @@ distributionManagement statusverified/status /distributionManagement - dependency -groupIdeclipsetest/groupId -artifactIddeps-direct-compile/artifactId -version1.0/version - /dependency - dependency -groupIdeclipsetest/groupId -artifactIddeps-direct-test/artifactId -version1.0/version -scopetest/scope - /dependency - dependency -groupIdeclipsetest/groupId -artifactIddeps-direct-provided/artifactId -version1.0/version -scopeprovided/scope - /dependency - dependency -groupIdeclipsetest/groupId -artifactIddeps-direct-optional/artifactId -version1.0/version -optionaltrue/optional - /dependency + dependencies +dependency + groupIdeclipsetest/groupId + artifactIddeps-direct-compile/artifactId + version1.0/version +/dependency +dependency + groupIdeclipsetest/groupId + artifactIddeps-direct-test/artifactId + version1.0/version + scopetest/scope +/dependency +dependency + groupIdeclipsetest/groupId + artifactIddeps-direct-provided/artifactId + version1.0/version + scopeprovided/scope +/dependency +dependency + groupIdeclipsetest/groupId + artifactIddeps-direct-optional/artifactId + version1.0/version + optionaltrue/optional +/dependency + /dependencies /project Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.pom URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.pom?rev=329865r1=329864r2=329865view=diff == --- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.pom (original) +++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/m2repo/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.pom Mon Oct 31 09:24:10 2005 @@ -1,4 +1,5 @@ -project +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 groupIdeclipsetest/groupId artifactIdrefproject-compile/artifactId @@ -6,27 +7,29 @@ distributionManagement statusverified/status /distributionManagement - dependency -groupIdeclipsetest/groupId -artifactIddeps-refproject-compile/artifactId -version1.0/version - /dependency - dependency -groupIdeclipsetest/groupId -artifactIddeps-refproject-test/artifactId -version1.0/version -scopetest/scope - /dependency - dependency -groupIdeclipsetest/groupId -artifactIddeps-refproject-provided/artifactId -version1.0/version -scopeprovided/scope - /dependency - dependency -groupIdeclipsetest/groupId -artifactIddeps-refproject-optional/artifactId -version1.0/version -optionaltrue/optional - /dependency + dependencies +dependency + groupIdeclipsetest/groupId + artifactIddeps-refproject-compile/artifactId + version1.0/version +/dependency +dependency + groupIdeclipsetest/groupId +
svn commit: r329869 - in /maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test: java/org/apache/maven/plugin/eclipse/ projects/master-test/module-1/ projects/master-test/module-2/
Author: fgiust
Date: Mon Oct 31 09:44:27 2005
New Revision: 329869
URL: http://svn.apache.org/viewcvs?rev=329869view=rev
Log:
final fix for expected results
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/wtpmodules
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java?rev=329869r1=329868r2=329869view=diff
==
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginMasterProjectTest.java
Mon Oct 31 09:44:27 2005
@@ -73,12 +73,18 @@
executeMaven2CommandLine( basedir );
assertFileEquals( null, new File( basedir, module-1/project ), new
File( basedir, module-1/.project ) );
+
+// @fixme missing direct optional dependency
assertFileEquals( null, new File( basedir, module-1/classpath ), new
File( basedir, module-1/.classpath ) );
assertFileEquals( null, new File( basedir, module-1/wtpmodules ),
new File( basedir, module-1/.wtpmodules ) );
// the real test: this should include any sort of direct/transitive
dependency handled by mvn
assertFileEquals( null, new File( basedir, module-2/project ), new
File( basedir, module-2/.project ) );
+
+// @fixme missing direct optional dependency + unneeded transitive
dependencies
assertFileEquals( null, new File( basedir, module-2/classpath ), new
File( basedir, module-2/.classpath ) );
+
+// @fixme the list of dependencies in .wtpmodules should be the same
added by the war plugin
assertFileEquals( null, new File( basedir, module-2/wtpmodules ),
new File( basedir, module-2/.wtpmodules ) );
}
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath?rev=329869r1=329868r2=329869view=diff
==
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/classpath
Mon Oct 31 09:44:27 2005
@@ -4,7 +4,7 @@
classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/
classpathentry kind=var
path=M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar/
classpathentry kind=var
path=M2_REPO/eclipsetest/refproject-test/1.0/refproject-test-1.0.jar/
- classpathentry kind=lib
path=D:/apps/maven-2/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-1/refproject-sysdep.jar/
+ classpathentry kind=lib
path=${basedir}/src/test/projects/master-test/module-1/refproject-sysdep.jar/
classpathentry kind=var
path=M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar/
classpathentry kind=var
path=M2_REPO/eclipsetest/refproject-provided/1.0/refproject-provided-1.0.jar/
classpathentry kind=var
path=M2_REPO/eclipsetest/refproject-optional/1.0/refproject-optional-1.0.jar/
Modified:
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath?rev=329869r1=329868r2=329869view=diff
==
---
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
(original)
+++
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/projects/master-test/module-2/classpath
Mon Oct 31 09:44:27 2005
@@ -3,13 +3,10 @@
classpathentry kind=output path=target/classes/
classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/
classpathentry kind=var
path=M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar/
- classpathentry kind=lib
svn commit: r329875 - /maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
Author: jvanzyl
Date: Mon Oct 31 10:21:35 2005
New Revision: 329875
URL: http://svn.apache.org/viewcvs?rev=329875view=rev
Log:
o checking eclipse ide guide sent to me by Bernd Mau [EMAIL PROTECTED]
Kenney, Vincent, do you think you could take a look at this. I'm not
an Eclipse user.
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt?rev=329875r1=329874r2=329875view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ide-eclipse.apt
Mon Oct 31 10:21:35 2005
@@ -1,17 +1,233 @@
--
Guide to using Eclipse with Maven 2.x
--
- Jason van Zyl
+ Bernd Mau, [EMAIL PROTECTED]
--
- 12 October 2005
+ 28 October 2005
--
Guide to using Eclipse with Maven 2.x
- To generate the Eclipse project files from your POM you execute the following
command:
+ This mini guide explains howto use Maven 2 in Eclipse IDE.
+ * {{{#Maven 2 repository}Maven 2 repository}}
+
+ * {{{#Maven as an external tool}Maven as an external tool}}
+
+ * {{{#Simple Project}Simple Project}}
+
+ * {{{#Multiple Module Project}Multiple Module Project}}
+
+* {Maven 2 repository}
+
+ Eclipse needs to know the path to the local maven
+repository. Therefore the classpath variable M2_REPO has to be
+set. Execute the following command:
+
+++
+
+mvn -Declipse.workspace=path-to-eclipse-workspace eclipse:add-maven-repo
+
+++
+
+ You can also define a new classpath variable inside eclipse: From the
+menu bar, select Window Preferences. Select the Java Build Path
+Classpath Variables page.
+
+ Issue: The command does not work. Aside from it should not require a POM.
+
+* {Maven as an external tool}
+
+ You might want to execute some maven goals from inside eclipse. This
+is possible by configuring an external launcher. It is best practice
+to prepare eclipse by adding a variable, which points to your local
+maven excutable (mvn.bat/mvn). From the menu bar, select Window
+Preferences. Select the Run/Debug String Substitution. Add a new
+variable e.g. maven_exec. When you set up a new external launcher
+(from the menu bar, select Run External Tools. Select Program) you
+can refer to maven_exec in the location field. Furhtermore refer to
+project_loc as the working directory and specify the maven goals of
+your choice as arguments, e.g. eclipse:eclipse. For further
+information please refer to the eclipse help.
+
+ Issue: Would be nice, if the plugin generates the variable and a runner.
+
+
+* {Simple Project}
+
+ If you have a simple java project which is made up of only one
+module, using eclipse is very simple. To generate the eclipse project
+files from your POM you execute the following command:
+
+++
+
+mvn eclipse:eclipse
+
+++
+
+ If you have created or checked out the project with eclipse, you only
+have to refresh the project in your workspace. Otherwise you have to
+import the project into your eclipse workspace (From the menu bar,
+select File Import Existing Projects into Workspace). In the
+latter case the project (directory) should not be located in your
+workspace, because eclipse might come into trouble, especially if you
+want to use eclipse as the scm client.
+
+* {Multiple Module Project}
+
+ Due to the workspace idea many eclipse users are used to a flat
+layout and therefore want to keep this structure, which is possible
+but not recommended. Actually, the only reason for a {{{#Flat Project
+Layout}flat multiple module project layout}} is the possibility to
+checkout and edit the parent POM without checking out the whole
+project. The following sample shows how to handle maven multiple
+module projects with eclipse while keeping the
+{{{http://maven.apache.org/guides/mini/guide-multi-module.html}recommended
+hierachical project layout}}.
+
+
+** {Step by Step from Scratch}
+
+ Supposing eclipse is your favorite SCM client, this step by step
+example shows how to set up a new mutiple module project.
+
+ [[1]] Set up a new eclipse workspace called step-by-step and add
+the M2_REPO classpath variable as {{{#Maven 2 repository}described
+above}}.
+
+ [[1]] Open the command line shell and change to the newly created workspace
directory.
+
+ [[1]] From the command line change to newly created step-by-step
+workspace and create a new maven project using the archetype plugin.
+
+++
+mvn archetype:create -DgroupId=guide.ide.eclipse -DartifactId=guide-ide-eclipse
+++
+
+ [[1]] Create a new simple project guide-ide-eclipse inside the
+step-by-step workspace with eclipse (From the menu bar, select
+File New Project. Select Simple
svn commit: r329922 - /maven/maven-1/plugins/trunk/maven.xml
Author: aheritier
Date: Mon Oct 31 14:37:43 2005
New Revision: 329922
URL: http://svn.apache.org/viewcvs?rev=329922view=rev
Log:
do not use dot in inner script variables names (interpreted as a property...)
Modified:
maven/maven-1/plugins/trunk/maven.xml
Modified: maven/maven-1/plugins/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/maven.xml?rev=329922r1=329921r2=329922view=diff
==
--- maven/maven-1/plugins/trunk/maven.xml (original)
+++ maven/maven-1/plugins/trunk/maven.xml Mon Oct 31 14:37:43 2005
@@ -30,15 +30,14 @@
/goal
goal name=plugins:deploy-all-sites description=Create and deploy the web
site for all plugins
!-- We don't want to have the question about to deploy the root site
after each plugin --
-ant:property name=skip.main.site value=true/
-ant:property name=goal value=site:deploy/
+j:set var=skipQuestion value=true scope=parent/
+j:set var=goal value=site:deploy/
attainGoal name=multiproject:goal/
attainGoal name=multiproject:site/
attainGoal name=site:deploy/
/goal
goal name=confirm-and-deploy-site
-j:set var=skipQuestion value=${skip.main.site}/
-j:if test=${!empty(skipQuestion) and skipQuestion==true}
+j:if test=${(skipQuestion == null) or not (skipQuestion == 'true')}
i:ask question=Would you like to regenerate and deploy the main
plugins site (y/n)? answer=ok default=y/
j:if test=${ok == 'y'}
attainGoal name=multiproject:site/
svn commit: r329928 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Author: vsiveton
Date: Mon Oct 31 15:10:58 2005
New Revision: 329928
URL: http://svn.apache.org/viewcvs?rev=329928view=rev
Log:
PR: MNG-1382(duplicate files exception)
Update defaultExcludes depending locales and defaultLocale
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=329928r1=329927r2=329928view=diff
==
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Mon Oct 31 15:10:58 2005
@@ -291,6 +291,14 @@
// Try to find duplicate files
Map duplicate = new LinkedHashMap();
String defaultExcludes = StringUtils.join(
FileUtils.getDefaultExcludes(), , );
+if ( locale.getLanguage().equals( defaultLocale.getLanguage()
) )
+{
+for (Iterator it = localesList.iterator(); it.hasNext();)
+{
+Locale l = (Locale) it.next();
+defaultExcludes += , + l.getLanguage() + /**;
+}
+}
if ( siteDirectoryFile.exists() )
{
svn commit: r329929 - /maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ibiblio-upload.apt
Author: carlos Date: Mon Oct 31 15:17:03 2005 New Revision: 329929 URL: http://svn.apache.org/viewcvs?rev=329929view=rev Log: Added required modelVersion and a basic sample Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ibiblio-upload.apt Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ibiblio-upload.apt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ibiblio-upload.apt?rev=329929r1=329928r2=329929view=diff == --- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ibiblio-upload.apt (original) +++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-ibiblio-upload.apt Mon Oct 31 15:17:03 2005 @@ -41,6 +41,8 @@ Note that the bundle will be read by a script, so it must follow the above format. Also, the pom.xml should at least contain the following elements: + * modelVersion + * groupId * artifactId @@ -58,6 +60,35 @@ * description * dependencies + + + A basic sample: + +++ + +project + modelVersion4.0.0/modelVersion + groupIdorg.apache.maven/groupId + artifactIdmaven/artifactId + version2.0/version + packagingjar/packaging + nameMaven core/name + urlhttp://maven.apache.org/url + descriptionThe maven main core project description/description + scm +urlhttp://svn.apache.org/viewcvs.cgi/maven/url + /scm + dependencies +dependency + groupId.../groupId + artifactId.../artifactId + version.../version +/dependency +... + dependencies +/project + +++ []
svn commit: r329931 - in /maven/maven-1/core/trunk/xdocs: index.xml reference/repository-upload.xml start/download.xml
Author: aheritier Date: Mon Oct 31 15:24:28 2005 New Revision: 329931 URL: http://svn.apache.org/viewcvs?rev=329931view=rev Log: Fix links to m2 site Modified: maven/maven-1/core/trunk/xdocs/index.xml maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml maven/maven-1/core/trunk/xdocs/start/download.xml Modified: maven/maven-1/core/trunk/xdocs/index.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/index.xml?rev=329931r1=329930r2=329931view=diff == --- maven/maven-1/core/trunk/xdocs/index.xml (original) +++ maven/maven-1/core/trunk/xdocs/index.xml Mon Oct 31 15:24:28 2005 @@ -43,8 +43,8 @@ This release is considered stable with a feature set comparable to Maven 1.0. /p p - For more information, see a href=/maven2/index.htmlMaven 2.0/a or go straight to the - a href=/maven2/download.htmlDownload page/a. + For more information, see a href=/index.htmlMaven 2.0/a or go straight to the + a href=/download.htmlDownload page/a. /p p style=font-size: larger; font-weight: bold 12 September 2005 - Maven 1.1 Beta 2 Released @@ -106,7 +106,7 @@ /p p Maven 2.0 is a rewrite of the original Maven application. For more information, see the - a href=/maven2/index.htmlMaven 2.0/a section. + a href=/index.htmlMaven 2.0/a section. /p /subsection Modified: maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml?rev=329931r1=329930r2=329931view=diff == --- maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml (original) +++ maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml Mon Oct 31 15:24:28 2005 @@ -93,7 +93,7 @@ You can request a upload for a maven 2 project just using the maven 2 pom.xml instead of the maven 1 project.xml referenced previously. The jar will be uploaded to both maven 1 and maven 2 repos.br/ - a href=http://maven.apache.org/maven2/guides/mini/guide-ibiblio-upload.html;More information/a + a href=http://maven.apache.org/guides/mini/guide-ibiblio-upload.html;More information/a /p /subsection Modified: maven/maven-1/core/trunk/xdocs/start/download.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/start/download.xml?rev=329931r1=329930r2=329931view=diff == --- maven/maven-1/core/trunk/xdocs/start/download.xml (original) +++ maven/maven-1/core/trunk/xdocs/start/download.xml Mon Oct 31 15:24:28 2005 @@ -36,7 +36,7 @@ subsection name=Download Maven 2.0 p Maven 2.0 is the current stable release of Maven. For more information and - installation instructions, see the a href=/maven2/index.htmlMaven 2.0/a section. + installation instructions, see the a href=/index.htmlMaven 2.0/a section. /p /subsection subsection name=Download Maven 1.1 Beta 2
svn commit: r329932 - /maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml
Author: aheritier Date: Mon Oct 31 15:33:14 2005 New Revision: 329932 URL: http://svn.apache.org/viewcvs?rev=329932view=rev Log: PR: MAVEN-1720 Submitted by : Lukas Theussl Reviewed by : Arnaud Heritier Better documentation of SNAPSHOT dependencies, following confusion on the user list. Modified: maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml Modified: maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml?rev=329932r1=329931r2=329932view=diff == --- maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml (original) +++ maven/maven-1/core/trunk/xdocs/using/managing-dependencies.xml Mon Oct 31 15:33:14 2005 @@ -115,7 +115,16 @@ p Assuming that project is publishing a version called codeSNAPSHOT/code (which happens when the codejar:deploy-snapshot/code goal is called), then each time you build Maven will check the remote - repository for changes in that JAR and download it again if a newer version is available. + repository for changes in that JAR and download it again if a newer codeSNAPSHOT/code is available. +/p + +p + bNote:/b It seems to be a common misconception that Maven would + replace codeSNAPSHOT/code by the most current version of a project + that is available in the repository. This is not the case: using a + codeSNAPSHOT/code dependency requires that the project that you + depend on has actually published a codeSNAPSHOT/code, + and only this codeSNAPSHOT/code will get updated automatically. /p p
svn commit: r329946 - in /maven/components/trunk: maven-core-it/it2002/ maven-core-it/it2002/project/subproject2/ maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/
Author: jdcasey
Date: Mon Oct 31 17:11:05 2005
New Revision: 329946
URL: http://svn.apache.org/viewcvs?rev=329946view=rev
Log:
PR: MNG-1101
Fixed dependency-exclusion propagation to the release-pom.xml, and changed the
pom-file handling for release:perform to allow non-standard POM filenames, and
to prompt in the case where the POM being used is the release-pom.xml.
Modified:
maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml
maven/components/trunk/maven-core-it/it2002/test.sh
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Modified:
maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml?rev=329946r1=329945r2=329946view=diff
==
--- maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml
(original)
+++ maven/components/trunk/maven-core-it/it2002/project/subproject2/pom.xml Mon
Oct 31 17:11:05 2005
@@ -13,6 +13,12 @@
groupIdorg.apache.maven.it2002/groupId
artifactIdproject-sub1/artifactId
version1.0-SNAPSHOT/version
+ exclusions
+exclusion
+ groupIdorg.apache.maven/groupId
+ artifactIdmaven-artifact-manager/artifactId
+/exclusion
+ /exclusions
/dependency
dependency
groupIdorg.apache.maven/groupId
Modified: maven/components/trunk/maven-core-it/it2002/test.sh
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/test.sh?rev=329946r1=329945r2=329946view=diff
==
--- maven/components/trunk/maven-core-it/it2002/test.sh (original)
+++ maven/components/trunk/maven-core-it/it2002/test.sh Mon Oct 31 17:11:05 2005
@@ -22,13 +22,14 @@
cat pom.xml | sed s#\${project.file.parentFile.parentFile}#$dir#g tmp
mv tmp pom.xml
+
svn ci -m 'update scm' pom.xml
rm -Rf target
-m2 -e release:prepare -Denv=test -B -Dtag=test-tag
+mvn -DgenerateReleasePoms=true -e release:prepare -Denv=test -B -Dtag=test-tag
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-m2 -e release:perform -Denv=test
+mvn -DreleasePom=release-pom.xml -e release:perform -Denv=test
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=329946r1=329945r2=329946view=diff
==
---
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Mon Oct 31 17:11:05 2005
@@ -21,6 +21,7 @@
import org.apache.maven.plugins.release.helpers.ReleaseProgressTracker;
import org.apache.maven.plugins.release.helpers.ScmHelper;
import org.apache.maven.scm.manager.ScmManager;
+import org.codehaus.plexus.components.interactivity.InputHandler;
/**
* @author a href=mailto:[EMAIL PROTECTED]John Casey/a
@@ -35,10 +36,20 @@
*/
private ScmManager scmManager;
+/**
+ * @component
+ */
+private InputHandler inputHandler;
+
private ScmHelper scmHelper;
protected abstract ReleaseProgressTracker getReleaseProgress()
throws MojoExecutionException;
+
+protected InputHandler getInputHandler()
+{
+return inputHandler;
+}
protected ScmHelper getScm( String directory )
throws MojoExecutionException
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java?rev=329946r1=329945r2=329946view=diff
==
---
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
Mon Oct 31
svn commit: r329948 - in /maven/components/trunk/maven-plugin-tools: maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/ maven-plugin-tools-ant/integration-tests/simpleUsage/usage/ maven-plug
Author: jdcasey
Date: Mon Oct 31 17:25:19 2005
New Revision: 329948
URL: http://svn.apache.org/viewcvs?rev=329948view=rev
Log:
PR: MNG-897
Fixing abstract scripted mojo descriptor extractor to properly construct script
resource directories. Also, cleaned up the usage integration test. Ant support
works now, but we need to decide what version this should be released under. It
will involve re-releasing the plugin-plugin, to take advantage of the new
maven-plugin-tools-api, I think.
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml?rev=329948r1=329947r2=329948view=diff
==
---
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml
(original)
+++
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/plugin/pom.xml
Mon Oct 31 17:25:19 2005
@@ -25,6 +25,7 @@
/dependencies
build
+scriptSourceDirectorysrc/main/scripts/scriptSourceDirectory
plugins
plugin
artifactIdmaven-plugin-plugin/artifactId
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml?rev=329948r1=329947r2=329948view=diff
==
---
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml
(original)
+++
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-ant/integration-tests/simpleUsage/usage/pom.xml
Mon Oct 31 17:25:19 2005
@@ -32,14 +32,14 @@
/dependency
/dependencies
-!-- configuration
+configuration
nameHani/name
-/configuration --
+/configuration
executions
execution
idtest/id
-phaseinstall/phase
+phasepackage/phase
goals
goaltest/goal
/goals
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java?rev=329948r1=329947r2=329948view=diff
==
---
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
(original)
+++
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
Mon Oct 31 17:25:19 2005
@@ -31,13 +31,13 @@
String scriptExtension = getScriptFileExtension();
Map scriptFilesKeyedByBasedir =
-gatherFilesByBasedir( project.getScriptSourceRoots(),
scriptExtension );
-
+gatherFilesByBasedir( project.getBasedir(),
project.getScriptSourceRoots(), scriptExtension );
+
List mojoDescriptors;
if ( !StringUtils.isEmpty( metadataExtension ) )
{
Map metadataFilesKeyedByBasedir =
-gatherFilesByBasedir( project.getScriptSourceRoots(),
metadataExtension );
+gatherFilesByBasedir( project.getBasedir(),
project.getScriptSourceRoots(), metadataExtension );
mojoDescriptors = extractMojoDescriptorsFromMetadata(
metadataFilesKeyedByBasedir, pluginDescriptor );
}
@@ -100,7 +100,7 @@
}
}
-protected Map gatherFilesByBasedir( List directories, String
scriptFileExtension )
+protected Map gatherFilesByBasedir( File basedir, List directories, String
scriptFileExtension )
{
Map sourcesByBasedir = new TreeMap();
@@ -109,7 +109,8 @@
Set sources = new HashSet();
String resourceDir = (String) it.next();
-File dir = new File( resourceDir ).getAbsoluteFile();
+
+File dir
svn commit: r329957 - in /maven/components/trunk/maven-site/src/site/apt/guides: index.apt mini/guide-maven-evangelism.apt
Author: carlos
Date: Mon Oct 31 19:02:53 2005
New Revision: 329957
URL: http://svn.apache.org/viewcvs?rev=329957view=rev
Log:
Added maven evangelism guide
Added:
maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/index.apt
Modified: maven/components/trunk/maven-site/src/site/apt/guides/index.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/index.apt?rev=329957r1=329956r2=329957view=diff
==
--- maven/components/trunk/maven-site/src/site/apt/guides/index.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/guides/index.apt Mon Oct 31
19:02:53 2005
@@ -42,6 +42,8 @@
* {{{mini/guide-ibiblio-upload.html}Guide to uploading artifacts to Ibiblio}}
+ * {{{mini/guide-maven-evangelism.html}Guide to maven evangelism, improving
metadata in ibiblio}}
+
* {{{mini/guide-ide-eclipse.html}Guide to using Eclipse with Maven 2.x}}
* {{{mini/guide-ide-idea.html}Guide to using IDEA with Maven 2.x}}
Added:
maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt?rev=329957view=auto
==
---
maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt
(added)
+++
maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt
Mon Oct 31 19:02:53 2005
@@ -0,0 +1,62 @@
+ --
+ Guide to Maven Evangelism
+ --
+ Carlos Sanchez
+ --
+ 31 October 2005
+ --
+
+Guide to add, improve or fix metadata in the ibiblio maven 2 repository
+
+ Checkout with subversion the poms you need from
+ svn://svn.codehaus.org/maven/scm/repository
+ (note that this subversion repo has a lot of files and folders)
+
+ Fix the poms and open an issue at
{{{http://jira.codehaus.org/browse/MEV}JIRA}} with
+ a patch file from subversion in unified diff format, explaining the reasons
why
+ it needs to be changed (there were no dependencies, wrong info,...).
+
+
+
+Developers information
+
+ The canonical repository is at beaver.codehaus.org, under
/home/projects/maven
+
+ * repository-staging/to-ibiblio/maven - maven 1 repo
+
+ * repository-staging/to-ibiblio/maven2 - maven 2 repo
+
+
+
+ Every 4 hours a crontab runs
+
+ $HOME/repository-tools/synchronize.sh 21 | tee
$HOME/repository-tools/last-sync-results.txt
+
+
+
+ Folder contents:
+
+ * components - svn checkout from maven/components svn
+
+ * components/maven-meeper/src/bin/deploy-bundle script to deploy an
upload bundle from JIRA MAVENUPLOAD
+
+ * components/maven-meeper/src/bin/syncopate/ scripts to rsync from
partner repos
+
+ * components/maven-meeper/src/bin/syncopate/conf/ syncopate
configuration for each of the partners
+
+ * components/maven-meeper/src/bin/ibiblio-sync/ scripts to rsync to and
from ibiblio
+
+ * repository-tools/ibiblio-sync/ link to
components/maven-meeper/src/bin/ibiblio-sync/
+
+ * repository-tools/synchronize.sh link to
components/maven-meeper/src/bin/synchronize.sh
+
+ * repository-tools/repoclean snapshot of the repoclean tool
+
https://svn.apache.org/repos/asf/maven/components/trunk/sandbox/repoclean
+
+
+
+ The developer connection to the subversion pom repository is at
+
+ svn+ssh://[EMAIL PROTECTED]/home/projects/maven/scm/repository
+
+ It only contains m2 poms (manually added), and this poms will overwrite
everything in the maven2 repo.
svn commit: r329958 - in /maven/maven-1/plugins/trunk/release: plugin.jelly xdocs/changes.xml
Author: brett
Date: Mon Oct 31 19:06:58 2005
New Revision: 329958
URL: http://svn.apache.org/viewcvs?rev=329958view=rev
Log:
PR: MPRELEASE-11
Submitted by: Fredrik Vraalsen
allow non-jar dependencies
Modified:
maven/maven-1/plugins/trunk/release/plugin.jelly
maven/maven-1/plugins/trunk/release/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/release/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/plugin.jelly?rev=329958r1=329957r2=329958view=diff
==
--- maven/maven-1/plugins/trunk/release/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/release/plugin.jelly Mon Oct 31 19:06:58 2005
@@ -88,7 +88,7 @@
ant:fileset dir=${mavenRepoLocal}
j:forEach var=dependency
items=${pom.dependencies}
j:if
test='${category.equals(dependency.getProperty(category))}'
-ant:include
name=${dependency.artifactDirectory}/jars/${dependency.artifact}/
+ant:include
name=${dependency.artifactDirectory}/${dependency.type}s/${dependency.artifact}/
ant:include
name=${dependency.artifactDirectory}/licenses/${dependency.artifactId}.license/
/j:if
/j:forEach
Modified: maven/maven-1/plugins/trunk/release/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/xdocs/changes.xml?rev=329958r1=329957r2=329958view=diff
==
--- maven/maven-1/plugins/trunk/release/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/release/xdocs/changes.xml Mon Oct 31 19:06:58
2005
@@ -26,6 +26,7 @@
/properties
body
release version=1.5-SNAPSHOT date=In SVN
+ action dev=brett type=fix issue=MPRELEASE-11handle non-jar
dependnecies/action
action dev=aheritier type=update issue=MAVEN-1712Update
dependencies to match ones in maven 1.1 core and to unify them between plugins.
The following dependencies are updated :
ul
limaven v1.0-rc2 - v1.0.2/li
svn commit: r329961 - /maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt
Author: carlos Date: Mon Oct 31 19:13:11 2005 New Revision: 329961 URL: http://svn.apache.org/viewcvs?rev=329961view=rev Log: Improvements Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt Modified: maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt?rev=329961r1=329960r2=329961view=diff == --- maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt (original) +++ maven/components/trunk/maven-site/src/site/apt/guides/mini/guide-maven-evangelism.apt Mon Oct 31 19:13:11 2005 @@ -20,6 +20,21 @@ Developers information + + The developer connection to the subversion pom repository is at + + svn+ssh://[EMAIL PROTECTED]/home/projects/maven/scm/repository + + It only contains m2 poms (manually added), and this poms will overwrite everything in the maven2 repo. + + If a pom doesn't exist or has just the basic information (eg. was autogenerated) patches can be applied. + If it has already information, dependencies,... a consensus has to be reached. NEVER will be changed + a pom with the status tag set to verified. + + + +Information about the current configuration + The canonical repository is at beaver.codehaus.org, under /home/projects/maven * repository-staging/to-ibiblio/maven - maven 1 repo @@ -52,11 +67,3 @@ * repository-tools/repoclean snapshot of the repoclean tool https://svn.apache.org/repos/asf/maven/components/trunk/sandbox/repoclean - - - - The developer connection to the subversion pom repository is at - - svn+ssh://[EMAIL PROTECTED]/home/projects/maven/scm/repository - - It only contains m2 poms (manually added), and this poms will overwrite everything in the maven2 repo.
svn commit: r329968 - in /maven/components/trunk/sandbox/maven-one-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/java/o
Author: brett Date: Mon Oct 31 20:18:32 2005 New Revision: 329968 URL: http://svn.apache.org/viewcvs?rev=329968view=rev Log: add a plugin that creates maven 1.x plugins Added: maven/components/trunk/sandbox/maven-one-plugin/ (with props) maven/components/trunk/sandbox/maven-one-plugin/pom.xml (with props) maven/components/trunk/sandbox/maven-one-plugin/src/ maven/components/trunk/sandbox/maven-one-plugin/src/main/ maven/components/trunk/sandbox/maven-one-plugin/src/main/java/ maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/ maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/ maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/ maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/ maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java (with props) maven/components/trunk/sandbox/maven-one-plugin/src/main/resources/ maven/components/trunk/sandbox/maven-one-plugin/src/main/resources/META-INF/ maven/components/trunk/sandbox/maven-one-plugin/src/main/resources/META-INF/plexus/ maven/components/trunk/sandbox/maven-one-plugin/src/main/resources/META-INF/plexus/components.xml (with props) Propchange: maven/components/trunk/sandbox/maven-one-plugin/ -- --- svn:ignore (added) +++ svn:ignore Mon Oct 31 20:18:32 2005 @@ -0,0 +1,4 @@ +target +*.iml +*.ipr +*.iws Added: maven/components/trunk/sandbox/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-one-plugin/pom.xml?rev=329968view=auto == --- maven/components/trunk/sandbox/maven-one-plugin/pom.xml (added) +++ maven/components/trunk/sandbox/maven-one-plugin/pom.xml Mon Oct 31 20:18:32 2005 @@ -0,0 +1,42 @@ +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 + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-one-plugin/artifactId + packagingmaven-plugin/packaging + version1.0-SNAPSHOT/version + nameMaven 1.x Plugin/name + dependencies +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-plugin-api/artifactId + version2.0/version +/dependency +dependency + groupIdjunit/groupId + artifactIdjunit/artifactId + version3.8.1/version + scopetest/scope +/dependency +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-archiver/artifactId + version2.0/version +/dependency +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-project/artifactId + version2.0/version +/dependency +dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-archiver/artifactId + version1.0-alpha-3/version +/dependency +dependency + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-utils/artifactId + version1.0.4/version +/dependency + /dependencies +/project Propchange: maven/components/trunk/sandbox/maven-one-plugin/pom.xml -- svn:eol-style = native Propchange: maven/components/trunk/sandbox/maven-one-plugin/pom.xml -- svn:keywords = Author Date Id Revision Added: maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java?rev=329968view=auto == --- maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java (added) +++ maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java Mon Oct 31 20:18:32 2005 @@ -0,0 +1,159 @@ +package org.apache.maven.plugins; + +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * Licensed 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
svn commit: r329969 - in /maven/components/trunk: maven-artifact-ant/pom.xml maven-reporting/maven-reporting-api/pom.xml maven-reporting/maven-reporting-impl/pom.xml
Author: brett Date: Mon Oct 31 20:19:00 2005 New Revision: 329969 URL: http://svn.apache.org/viewcvs?rev=329969view=rev Log: add names Modified: maven/components/trunk/maven-artifact-ant/pom.xml maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml Modified: maven/components/trunk/maven-artifact-ant/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/pom.xml?rev=329969r1=329968r2=329969view=diff == --- maven/components/trunk/maven-artifact-ant/pom.xml (original) +++ maven/components/trunk/maven-artifact-ant/pom.xml Mon Oct 31 20:19:00 2005 @@ -7,6 +7,7 @@ modelVersion4.0.0/modelVersion artifactIdmaven-artifact-ant/artifactId version2.0.1-SNAPSHOT/version + nameMaven Tasks for Ant/name build plugins plugin Modified: maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml?rev=329969r1=329968r2=329969view=diff == --- maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml (original) +++ maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml Mon Oct 31 20:19:00 2005 @@ -7,6 +7,7 @@ modelVersion4.0.0/modelVersion artifactIdmaven-reporting-api/artifactId version2.0.1-SNAPSHOT/version + nameMaven Reporting API/name developers developer idvsiveton/id @@ -23,16 +24,6 @@ groupIdorg.codehaus.doxia/groupId artifactIddoxia-sink-api/artifactId version1.0-alpha-6-SNAPSHOT/version - exclusions -exclusion - artifactIdplexus-container-default/artifactId - groupIdplexus/groupId -/exclusion -exclusion - artifactIdplexus-utils/artifactId - groupIdplexus/groupId -/exclusion - /exclusions /dependency /dependencies -/project \ No newline at end of file +/project Modified: maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml?rev=329969r1=329968r2=329969view=diff == --- maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml (original) +++ maven/components/trunk/maven-reporting/maven-reporting-impl/pom.xml Mon Oct 31 20:19:00 2005 @@ -7,6 +7,7 @@ modelVersion4.0.0/modelVersion artifactIdmaven-reporting-impl/artifactId version2.0.1-SNAPSHOT/version + nameMaven Reporting/name developers developer idvsiveton/id @@ -70,4 +71,4 @@ /exclusions /dependency /dependencies -/project \ No newline at end of file +/project
svn commit: r329973 - in /maven/components/trunk/sandbox/maven-one-plugin: ./ src/main/java/org/apache/maven/plugins/ src/main/resources/META-INF/plexus/ src/site/ src/site/apt/
Author: brett
Date: Mon Oct 31 20:57:24 2005
New Revision: 329973
URL: http://svn.apache.org/viewcvs?rev=329973view=rev
Log:
add mojo for copying the artifact to the Maven 1.x repo, and add docs
Added:
maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOneRepositoryInstallMojo.java
(with props)
maven/components/trunk/sandbox/maven-one-plugin/src/site/
maven/components/trunk/sandbox/maven-one-plugin/src/site/apt/
maven/components/trunk/sandbox/maven-one-plugin/src/site/apt/introduction.apt
(with props)
maven/components/trunk/sandbox/maven-one-plugin/src/site/site.xml (with
props)
Modified:
maven/components/trunk/sandbox/maven-one-plugin/pom.xml
maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java
maven/components/trunk/sandbox/maven-one-plugin/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/sandbox/maven-one-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-one-plugin/pom.xml?rev=329973r1=329972r2=329973view=diff
==
--- maven/components/trunk/sandbox/maven-one-plugin/pom.xml (original)
+++ maven/components/trunk/sandbox/maven-one-plugin/pom.xml Mon Oct 31 20:57:24
2005
@@ -39,4 +39,14 @@
version1.0.4/version
/dependency
/dependencies
+ reporting
+plugins
+ plugin
+artifactIdmaven-plugin-plugin/artifactId
+configuration
+ goalPrefixmaven-one-plugin/goalPrefix
+/configuration
+ /plugin
+/plugins
+ /reporting
/project
Modified:
maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java?rev=329973r1=329972r2=329973view=diff
==
---
maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java
(original)
+++
maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOnePluginMojo.java
Mon Oct 31 20:57:24 2005
@@ -105,7 +105,10 @@
try
{
-archiver.getArchiver().addDirectory( contentDirectory,
DEFAULT_INCLUDES, DEFAULT_EXCLUDES );
+if ( contentDirectory.exists() )
+{
+archiver.getArchiver().addDirectory( contentDirectory,
DEFAULT_INCLUDES, DEFAULT_EXCLUDES );
+}
addFile( archiver, new File( plugin.jelly ) );
addFile( archiver, new File( plugin.properties ) );
Added:
maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOneRepositoryInstallMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOneRepositoryInstallMojo.java?rev=329973view=auto
==
---
maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOneRepositoryInstallMojo.java
(added)
+++
maven/components/trunk/sandbox/maven-one-plugin/src/main/java/org/apache/maven/plugins/MavenOneRepositoryInstallMojo.java
Mon Oct 31 20:57:24 2005
@@ -0,0 +1,155 @@
+package org.apache.maven.plugins;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.artifact.Artifact;
+import org.apache.maven.artifact.installer.ArtifactInstallationException;
+import org.apache.maven.artifact.installer.ArtifactInstaller;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.util.IOUtil;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Install the artifact in a maven one local repository
+ *
+ * @goal install-maven-one-repository
+ *
svn commit: r329977 - in /maven/components/trunk/maven-site/src/site: apt/helping.apt apt/patches.apt apt/where-is-it.apt site.xml xdoc/developers/code-style.xml
Author: brett
Date: Mon Oct 31 21:23:16 2005
New Revision: 329977
URL: http://svn.apache.org/viewcvs?rev=329977view=rev
Log:
convert some docs
Added:
maven/components/trunk/maven-site/src/site/xdoc/developers/code-style.xml
- copied unchanged from r327959,
maven/maven-1/core/trunk/xdocs/developers/code-style.xml
Modified:
maven/components/trunk/maven-site/src/site/apt/helping.apt
maven/components/trunk/maven-site/src/site/apt/patches.apt
maven/components/trunk/maven-site/src/site/apt/where-is-it.apt
maven/components/trunk/maven-site/src/site/site.xml
Modified: maven/components/trunk/maven-site/src/site/apt/helping.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/helping.apt?rev=329977r1=329976r2=329977view=diff
==
--- maven/components/trunk/maven-site/src/site/apt/helping.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/helping.apt Mon Oct 31
21:23:16 2005
@@ -1,68 +1,43 @@
-?xml version=1.0?
-!--
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- --
-
-document
-
- properties
-author email=[EMAIL PROTECTED]Brett Porter/author
-titleHow to Help/title
- /properties
-
- body
-section name=How to Help
- p
-As with any open source project, there are several ways you can help:
- /p
- ul
-liJoin the a href=../mail-lists.htmlmailing list/a and answer
other user's questions/li
-liReport bugs, feature requests and other issues in the a
href=../issue-tracking.htmlissue tracking/a
- application./li
-lia href=patches.htmlSubmit patches/a to reported issues (both
those you find, or that others have
- filed)/li
- /ul
- p
-Your participation in the community is much appreciated!
- /p
-/section
-section name=Why Would I Want to Help?
- p
-There are several reasons these are good things.
- /p
- ul
-liBy answering other people's questions, you can learn more for
yourself/li
-liBy submitting your own fixes, they get incorporated faster/li
-liBy reporting issues, you ensure that bugs don't get missed, or
forgotten/li
-liYou are giving back to a community that has given you software for
free/li
- /ul
-/section
-section name=How do I Join the Project?
- p
-Projects at Apache operate under a meritocracy, meaning those that the
developers notice participating to a
-high extent will be invited to join the project as a committer.
- /p
- p
-This is as much based on personality and ability to work with other
developers and the community as it is with
-proven technical ability. Being unhelpful to other users, or obviously
looking to become a committer for bragging
-rights and nothing else is frowned upon, as is asking to be made a
committer without having contributed
-sufficiently to be invited.
- /p
-/section
- /body
-/document
+ -
+How to Help
+ -
+Brett Porter
+ --
+1 November 2005
+ -
+
+How to Help
+
+ As with any open source project, there are several ways you can help:
+
+ * Join the {{{mail-lists.html} mailing list}} and answer other user's
questions
+
+ * Report bugs, feature requests and other issues in the
{{{issue-tracking.html} issue tracking}} application.
+
+ * {{{patches.html} Submit patches}} to reported issues (both those you
find, or that others have filed)
+
+ Your participation in the community is much appreciated!
+
+Why Would I Want to Help?
+
+ There are several reasons that are good things.
+
+* By answering other people's questions, you can learn more for yourself
+
+* By submitting your own fixes, they get incorporated faster
+
+* By reporting issues, you ensure that bugs don't get missed, or forgotten
+
+* You are giving back to a community that has given you software for free
+
+How do I Join the Project?
+
+ Projects at Apache operate under a meritocracy, meaning those that the
developers notice participating to a
+ high extent will be invited to join the project as a committer.
+
+ This is as much based on personality and ability to work with other
developers and the community as it is with
+ proven technical ability. Being unhelpful to other users, or obviously
svn commit: r329988 - in /maven/components/trunk/maven-site/src/site: apt/guides/development/guide-helping.apt apt/guides/development/guide-m2-development.apt apt/helping.apt apt/patches.apt site.xml
Author: brett
Date: Mon Oct 31 21:51:20 2005
New Revision: 329988
URL: http://svn.apache.org/viewcvs?rev=329988view=rev
Log:
removing docs I converted, as I found them in the guides.
add standard commit template to developer guide and fix some links
Removed:
maven/components/trunk/maven-site/src/site/apt/helping.apt
maven/components/trunk/maven-site/src/site/apt/patches.apt
maven/components/trunk/maven-site/src/site/xdoc/developers/code-style.xml
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/development/guide-helping.apt
maven/components/trunk/maven-site/src/site/apt/guides/development/guide-m2-development.apt
maven/components/trunk/maven-site/src/site/site.xml
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/development/guide-helping.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/development/guide-helping.apt?rev=329988r1=329987r2=329988view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/guides/development/guide-helping.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/guides/development/guide-helping.apt
Mon Oct 31 21:51:20 2005
@@ -43,12 +43,28 @@
rights and nothing else is frowned upon, as is asking to be made a committer
without having contributed
sufficiently to be invited.
-~~ Resources for committers
-~~lia href=http://www.apache.org/dev/;Developer Resources/a/li
-~~lia href=http://www.apache.org/foundation/;About the Apache Software
Foundation/a/li
-~~lia href=http://www.apache.org/dev/committers.html;Committer
FAQ/a/li
-~~lia
href=http://www.apache.org/~vgritsenko/stats/projects/maven.html;Web
Stats/a/li
-~~lia href=http://wiki.apache.org;Apache Wiki/a/li
+Developers Conventions
+
+ There are a number of conventions used in the project, which contributors
and developers alike should follow for
+ consistency's sake.
+
+ * {{{guide-m2-development.html#Maven Code Style} Code Style}}
+
+ * {{{guide-m2-development.html#Commit Message Template} Commit Message
Template}}
+
+Resources for committers
+
+ * {{{http://www.apache.org/dev/} Developer Resources}}
+
+ * {{{http://www.apache.org/foundation/} About the Apache Software
Foundation}}
+
+ * {{{http://www.apache.org/dev/committers.html} Committer FAQ}}
+
+ * {{{http://people.apache.org/~vgritsenko/stats/projects/maven.html} Web
Stats}}
+
+ * {{{http://people.apache.org/~coar/mlists.html#maven.apache.org} Mailing
List Stats}}
+
+ * {{{http://wiki.apache.org} Apache Wiki}}
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/development/guide-m2-development.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/development/guide-m2-development.apt?rev=329988r1=329987r2=329988view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/guides/development/guide-m2-development.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/guides/development/guide-m2-development.apt
Mon Oct 31 21:51:20 2005
@@ -50,7 +50,7 @@
When you find a issue you would like to work on add a comment in the issue
log so the core developers and other
people looking for work know that someone is already working on it.
-* {{Creating and submitting a patch}}
+* {Creating and submitting a patch}
When you have either completed an issue or just want some feedback on the
work you have done, create a patch
and attach the patch to the issue in question. We have a couple of guidelines
when creating patches:
@@ -206,7 +206,7 @@
{{{http://www.apache.org/dev/version-control.html#https-svn}Committer
Subversion Access}}
document and you must set your svn client with these properties file :
{{svn-eol-style.txt}}
-* Maven Code Style
+* {Maven Code Style}
The following sections show how to set up the code style for Maven in IDEA
and Eclipse.
It is strongly preferred that patches use this style before they are spplied.
@@ -219,10 +219,26 @@
After this, restart IDEA and open the settings to select the new code style.
-** Eclipse 3.x
+** Eclipse 3.x
Download
{{{../../maven-eclipse-codestyle.xml}maven-eclipse-codestyle.xml}}.
After this, select Window \ Preferences, and open up the configuration for
Java \ Code
Style \ Code Formatter. Click on the button labeled Import... and select the
file you
- downloaded. Give the style a name, and click OK.
\ No newline at end of file
+ downloaded. Give the style a name, and click OK.
+
+* {Commit Message Template}
+
+ Commits should have a message that follows this template:
+
+-
+PR: issue1, issue2 (using issue keys from JIRA, not URLs)
+Submitted by: (when it was a patch, put that persons name there)
+ comment
+-
+
+ PR can be omitted if there was no relevant JIRA issue, though it is
strongly encouraged to
svn commit: r329996 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: brett
Date: Mon Oct 31 23:07:44 2005
New Revision: 329996
URL: http://svn.apache.org/viewcvs?rev=329996view=rev
Log:
PR: MNG-1271
Submitted by: Edwin Punzalan
improve error message when pom.xml not found and required
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=329996r1=329995r2=329996view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Mon Oct 31 23:07:44 2005
@@ -337,7 +337,7 @@
if ( mojoDescriptor.isProjectRequired()
!session.isUsingPOMsFromFilesystem() )
{
throw new MojoExecutionException( Cannot execute mojo: +
mojoDescriptor.getGoal() +
-. It requires a project, but the build is not using one. );
+. It requires a project with an existing pom.xml, but the
build is not using one. );
}
if ( mojoDescriptor.isOnlineRequired()
session.getSettings().isOffline() )
svn commit: r329998 - /maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Author: brett
Date: Mon Oct 31 23:12:43 2005
New Revision: 329998
URL: http://svn.apache.org/viewcvs?rev=329998view=rev
Log:
PR: MNG-1342
Submitted by: Jerome Lacoste
improve surefire plugin docs
Modified:
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Modified:
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=329998r1=329997r2=329998view=diff
==
---
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
(original)
+++
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Mon Oct 31 23:12:43 2005
@@ -100,6 +100,8 @@
/**
* Specify this parameter if you want to use the test regex notation to
select tests to run.
+ * The regular expression will be used to create an include pattern
formatted like code**#47;${test}.java/code
+ * When used, the codeincludes/code and codeexcludes/code patterns
parameters are ignored
*
* @parameter expression=${test}
*/
@@ -107,6 +109,8 @@
/**
* List of patterns (separated by commas) used to specify the tests that
should be included in testing.
+ * When not specified and whent the codetest/code parameter is not
specified, the default includes will be
+ * code**#47;Test*.java **#47;*Test.java
**#47;*TestCase.java/code
*
* @parameter
*/
@@ -114,6 +118,8 @@
/**
* List of patterns (separated by commas) used to specify the tests that
should be excluded in testing.
+ * When not specified and whent the codetest/code parameter is not
specified, the default excludes will be
+ * code**#47;Abstract*Test.java **#47;Abstract*TestCase.java/code
*
* @parameter
*/
