svn commit: r571924 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src: main/java/org/apache/maven/doxia/module/xhtml/ test/java/org/apache/maven/doxia/module/xhtml/
Author: ltheussl
Date: Sat Sep 1 21:54:10 2007
New Revision: 571924
URL: http://svn.apache.org/viewvc?rev=571924view=rev
Log:
Write out default head and body to make it usable stand-alone. Add a simpler
constructor to the sink, the renderingContext shouldn't be required. Add the
identity test.
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
(with props)
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?rev=571924r1=571923r2=571924view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Sat Sep 1 21:54:10 2007
@@ -64,8 +64,6 @@
private PrintWriter writer;
-//private StringsMap directives;
-
private RenderingContext renderingContext;
private int[] cellJustif;
@@ -76,8 +74,28 @@
/**
* @param writer
+ */
+public XhtmlSink( Writer writer )
+{
+this( writer, null );
+}
+
+/**
+ * @param writer
+ * @param renderingContext
+ */
+public XhtmlSink( Writer writer, RenderingContext renderingContext )
+{
+this.writer = new PrintWriter( writer );
+
+this.renderingContext = renderingContext;
+}
+
+/**
+ * @param writer
* @param renderingContext
* @param directives
+ * @todo directives Map is not used
*/
public XhtmlSink( Writer writer, RenderingContext renderingContext, Map
directives )
{
@@ -129,12 +147,14 @@
/** [EMAIL PROTECTED] */
public void head()
{
-// Not used overridden in site renderer
-// directive( head() );
-
resetState();
headFlag = true;
+
+write( !DOCTYPE html PUBLIC \-//W3C//DTD XHTML 1.0
Transitional//EN\
\http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\; );
+write( html xmlns=\http://www.w3.org/1999/xhtml\; );
+
+writeStartTag( Tag.HEAD );
}
/** [EMAIL PROTECTED] */
@@ -142,8 +162,7 @@
{
headFlag = false;
-// Not used overridden in site renderer
-//directive( head_() );
+writeEndTag( Tag.HEAD );
}
/**
@@ -207,18 +226,14 @@
/** [EMAIL PROTECTED] */
public void body()
{
-// Not used overridden in site renderer
-//String body = directiveValue( body() );
-//write( body );
+writeStartTag( Tag.BODY );
}
/** [EMAIL PROTECTED] */
public void body_()
{
-// Not used overridden in site renderer
-//String body = directiveValue( body_() );
-//write( body );
-//resetState();
+writeEndTag( Tag.BODY );
+writeEndTag( Tag.HTML );
}
// --
@@ -1190,15 +1205,19 @@
/** [EMAIL PROTECTED] */
protected void write( String text )
{
-String relativePathToBasedir = renderingContext.getRelativePath();
-
-if ( relativePathToBasedir != null )
+// TODO: this doesn't belong here
+if ( renderingContext != null )
{
-text = StringUtils.replace( text, $relativePath,
relativePathToBasedir );
-}
-else
-{
-text = StringUtils.replace( text, $relativePath, . );
+String relativePathToBasedir = renderingContext.getRelativePath();
+
+if ( relativePathToBasedir == null )
+{
+text = StringUtils.replace( text, $relativePath, . );
+}
+else
+{
+text = StringUtils.replace( text, $relativePath,
relativePathToBasedir );
+}
}
writer.write( text );
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java?rev=571924view=auto
==
---
svn commit: r571772 - /maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt
Author: brianf Date: Sat Sep 1 05:01:34 2007 New Revision: 571772 URL: http://svn.apache.org/viewvc?rev=571772view=rev Log: updated with working example Modified: maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt Modified: maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt?rev=571772r1=571771r2=571772view=diff == --- maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt Sat Sep 1 05:01:34 2007 @@ -60,7 +60,7 @@ * Using the attached test JAR In order to use the attached test JAR that was created above you simply specify a dependency on the main - artifact with a specified type of test-jar: + artifact with a specified type of tests: ++ @@ -71,7 +71,8 @@ groupIdcom.myco.app/groupId artifactIdfoo/artifactId version1.0-SNAPSHOT/version - typetest-jar/type + typetests/type + scopetest/scope /dependency /dependencies ...
svn commit: r571788 - /maven/trunks/
Author: vsiveton Date: Sat Sep 1 05:40:23 2007 New Revision: 571788 URL: http://svn.apache.org/viewvc?rev=571788view=rev Log: o added enforcer to externals (due to r571653) Modified: maven/trunks/ (props changed) Propchange: maven/trunks/ -- --- svn:externals (original) +++ svn:externals Sat Sep 1 05:40:23 2007 @@ -20,3 +20,4 @@ ant-tasks https://svn.apache.org/repos/asf/maven/ant-tasks/trunk sandbox https://svn.apache.org/repos/asf/maven/sandbox/trunk project https://svn.apache.org/repos/asf/maven/project +enforcer https://svn.apache.org/repos/asf/maven/enforcer/trunk
svn commit: r571806 - /maven/pom/trunk/maven/pom.xml
Author: dennisl Date: Sat Sep 1 07:40:05 2007 New Revision: 571806 URL: http://svn.apache.org/viewvc?rev=571806view=rev Log: o Use the new javadocs URL for log4j. Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=571806r1=571805r2=571806view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sat Sep 1 07:40:05 2007 @@ -204,7 +204,7 @@ linkhttp://commons.apache.org/logging/apidocs//link linkhttp://commons.apache.org/pool/apidocs//link linkhttp://www.junit.org/junit/javadoc//link -linkhttp://logging.apache.org/log4j/docs/api//link +linkhttp://logging.apache.org/log4j/1.2/apidocs//link linkhttp://jakarta.apache.org/regexp/apidocs//link linkhttp://velocity.apache.org/engine/releases/velocity-1.5/apidocs//link /links
svn commit: r571859 [2/2] - in /maven/artifact/trunk/src: main/java/org/apache/maven/artifact/manager/ main/java/org/apache/maven/artifact/resolver/ test/java/org/apache/maven/artifact/resolver/
Modified:
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=571859r1=571858r2=571859view=diff
==
---
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
(original)
+++
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Sat Sep 1 12:15:55 2007
@@ -311,14 +311,9 @@
b.addDependency( c, [1.0,2.0] );
-try
-{
-ArtifactResolutionResult res = collect( a );
-fail( Should not succeed collecting, got: + res.getArtifacts()
);
-}
-catch ( ArtifactResolutionException expected )
-{
-}
+ArtifactResolutionResult res = collect( a );
+
+assertTrue( res.hasVersionRangeViolations() );
}
public void testUnboundedRangeWhenVersionUnavailable()
@@ -329,15 +324,9 @@
a.addDependency( c, [2.0,] );
b.addDependency( c, [1.0,] );
-try
-{
-ArtifactResolutionResult res = collect( a );
-fail( Should not succeed collecting, got: + res.getArtifacts()
);
-}
-catch ( ArtifactResolutionException expected )
-{
-assertTrue( true );
-}
+ArtifactResolutionResult res = collect( a );
+
+assertTrue( res.hasVersionRangeViolations() );
}
public void testUnboundedRangeBelowLastRelease()
@@ -362,15 +351,9 @@
createArtifactSpec( c, 2.0 );
a.addDependency( c, [10.0,) );
-try
-{
-ArtifactResolutionResult res = collect( a );
-fail( Should not succeed collecting, got: + res.getArtifacts()
);
-}
-catch ( ArtifactResolutionException expected )
-{
-assertTrue( true );
-}
+ArtifactResolutionResult res = collect( a );
+
+assertTrue( res.hasVersionRangeViolations() );
}
public void testResolveManagedVersion()
@@ -675,6 +658,11 @@
a.addDependency( b, [1.0,) );
createArtifactSpec( b, 1.0-SNAPSHOT );
+ArtifactResolutionResult res = collect( a );
+
+assertTrue( res.hasVersionRangeViolations() );
+
+/*
try
{
ArtifactResolutionResult res = collect( a );
@@ -684,6 +672,7 @@
{
assertTrue( e.getMessage().indexOf( [1.0-SNAPSHOT] )
e.getMessage().indexOf( [1.0,) ) );
}
+*/
}
private Artifact getArtifact( String id, Set artifacts )
svn commit: r571860 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/resolver/
Author: jvanzyl Date: Sat Sep 1 12:20:38 2007 New Revision: 571860 URL: http://svn.apache.org/viewvc?rev=571860view=rev Log: o don't need this with the changes to maven-artifact Removed: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/resolver/
svn commit: r571861 - /maven/components/trunk/maven-embedder/idea-embedder.sh
Author: jvanzyl Date: Sat Sep 1 12:21:20 2007 New Revision: 571861 URL: http://svn.apache.org/viewvc?rev=571861view=rev Log: o add a little script for Vlad to build the embedder JAR for the IntelliJ integration Added: maven/components/trunk/maven-embedder/idea-embedder.sh (with props) Added: maven/components/trunk/maven-embedder/idea-embedder.sh URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/idea-embedder.sh?rev=571861view=auto == --- maven/components/trunk/maven-embedder/idea-embedder.sh (added) +++ maven/components/trunk/maven-embedder/idea-embedder.sh Sat Sep 1 12:21:20 2007 @@ -0,0 +1,6 @@ +#!/bin/sh + +# At this point I've already tested the embedder. This is just an easy way for the JetBrains folks +# to create the embedder they need for integration. + +mvn -Dmaven.test.skip=true -Pidea clean package Propchange: maven/components/trunk/maven-embedder/idea-embedder.sh -- svn:eol-style = native Propchange: maven/components/trunk/maven-embedder/idea-embedder.sh -- svn:executable = * Propchange: maven/components/trunk/maven-embedder/idea-embedder.sh -- svn:keywords = Author Date Id Revision
svn commit: r571847 - in /maven/sandbox/trunk/archetypeng: ./ archetype-plugin/ archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/
Author: rafale
Date: Sat Sep 1 11:05:57 2007
New Revision: 571847
URL: http://svn.apache.org/viewvc?rev=571847view=rev
Log:
Added Javadoc to fullfill docck:check
Modified:
maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java
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/AddLanguagesMojo.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/RemoveExtensionsMojo.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/RemoveLanguagesMojo.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/ShowExtensionsMojo.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/ShowLanguagesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/ShowRepositoriesMojo.java
maven/sandbox/trunk/archetypeng/pom.xml
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml?rev=571847r1=571846r2=571847view=diff
==
--- maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/pom.xml Sat Sep 1
11:05:57 2007
@@ -31,13 +31,15 @@
/parent
groupIdorg.apache.maven.plugins/groupId
-!-- TODO: The purpose is to call mvn archetypeng:*
- w/out the need to add a plugin group in settings --
+!-- The purpose is to call mvn archetypeng:*
+ w/out the need to add a plugin group in settings --
artifactIdmaven-archetypeng-plugin/artifactId
version1.0-SNAPSHOT/version
nameMaven ArchetypeNG Plugin/name
packagingmaven-plugin/packaging
+
+prerequisitesmaven2.0.7/maven/prerequisites
dependencies
dependency
Modified:
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java?rev=571847r1=571846r2=571847view=diff
==
---
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java
Sat Sep 1 11:05:57 2007
@@ -36,6 +36,10 @@
import java.util.List;
/**
+ * Adds one or more filtered extensions in the registry.
+ * The registered filtered extensions are used to discriminate
+ * text files from binary files based on their file extension
+ * during create-from-project.
* @author rafale
* @requiresProject false
* @goal add-extensions
@@ -49,16 +53,23 @@
ArchetypeRegistryManager archetypeRegistryManager;
/**
+ * The filtered extension to add to the registry.
+ *
+ * This option is mutually exclusive with extensions.
* @parameter expression=${extension}
*/
String extension;
/**
+ * The filtered extensions to add to the registry: ext1,ext2,...
+ *
+ * This option is mutually exclusive with extension.
* @parameter expression=${extensions}
*/
String extensions;
/**
+ * The location of the registry file.
* @parameter expression=${user.home}/.m2/archetype.xml
*/
private File archetypeRegistryFile;
Modified:
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddGroupsMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddGroupsMojo.java?rev=571847r1=571846r2=571847view=diff
svn commit: r571849 - in /maven/sandbox/trunk/archetypeng: archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java archetype-plugin/src/main/java/org/apache/mav
Author: rafale
Date: Sat Sep 1 11:09:07 2007
New Revision: 571849
URL: http://svn.apache.org/viewvc?rev=571849view=rev
Log:
Fixing ARCHETYPE-94 by having archetypes define different prefixes
Modified:
maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java
Modified:
maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=571849r1=571848r2=571849view=diff
==
---
maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
(original)
+++
maven/sandbox/trunk/archetypeng/archetype-creator/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
Sat Sep 1 11:09:07 2007
@@ -145,6 +145,7 @@
model.setArtifactId ( archetypeDefinition.getArtifactId () );
model.setVersion ( archetypeDefinition.getVersion () );
model.setPackaging ( maven-archetype );
+model.setName( archetypeDefinition.getArtifactId () );
Build build = new Build ();
model.setBuild ( build );
@@ -325,7 +326,7 @@
Archetype + archetypeDescriptor.getId () + old descriptor
written
);
-archetypeRegistryManager.addGroup ( archetypeConfiguration.getProperty
( Constants.GROUP_ID ), archetypeRegistryFile );
+archetypeRegistryManager.addGroup (
archetypeConfiguration.getGroupId(), archetypeRegistryFile );
}
private void addRequiredProperties (
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=571849r1=571848r2=571849view=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
Sat Sep 1 11:09:07 2007
@@ -102,8 +102,8 @@
{
if ( goalPrefix == null )
{
-//goalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId(
project.getArtifactId() );
-goalPrefix = archetypeng;
+//goalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId(
project.getArtifactId () );
+goalPrefix = project.getArtifactId ();
}
return goalPrefix;
svn commit: r571873 - /maven/components/trunk/make-embedder.sh
Author: jvanzyl Date: Sat Sep 1 14:27:48 2007 New Revision: 571873 URL: http://svn.apache.org/viewvc?rev=571873view=rev Log: o moved the the embedder directory Removed: maven/components/trunk/make-embedder.sh
svn commit: r571874 - in /maven/components/trunk/maven-embedder: embedder-idea.sh idea-embedder.sh pom.xml
Author: jvanzyl
Date: Sat Sep 1 14:28:26 2007
New Revision: 571874
URL: http://svn.apache.org/viewvc?rev=571874view=rev
Log:
o creating two scripts for convenience for the IntelliJ and Eclipse IDE
integrators
Added:
maven/components/trunk/maven-embedder/embedder-idea.sh
- copied unchanged from r571861,
maven/components/trunk/maven-embedder/idea-embedder.sh
Removed:
maven/components/trunk/maven-embedder/idea-embedder.sh
Modified:
maven/components/trunk/maven-embedder/pom.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=571874r1=571873r2=571874view=diff
==
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Sat Sep 1 14:28:26 2007
@@ -97,7 +97,7 @@
plugin
artifactIdshade-maven-plugin/artifactId
groupIdorg.codehaus.mojo/groupId
-version1.0-alpha-12-SNAPSHOT/version
+version1.0-alpha-12/version
executions
execution
phasepackage/phase
@@ -150,7 +150,7 @@
--
idtycho/id
properties
-bundleVersion2.1.0.v20070728-1835/bundleVersion
+bundleVersion2.1.0.v20070901-1427/bundleVersion
/properties
build
resources
@@ -163,7 +163,7 @@
plugin
artifactIdshade-maven-plugin/artifactId
groupIdorg.codehaus.mojo/groupId
-version1.0-alpha-11-SNAPSHOT/version
+version1.0-alpha-12/version
executions
execution
phasepackage/phase
@@ -171,7 +171,7 @@
goalshade/goal
/goals
configuration
- shadedArtifactIdmaven-embedder-idea/shadedArtifactId
+ finalNamemaven-embedder-tycho-${bundleVersion}/finalName
createDependencyReducedPomfalse/createDependencyReducedPom
!-- this will work with shade plugin 1.0-alpha-11-SNAP --
keepDependenciesWithProvidedScopetrue/keepDependenciesWithProvidedScope
@@ -185,9 +185,6 @@
excludejunit:junit/exclude
excludejmock:jmock/exclude
excludexml-apis:xml-apis/exclude
- !-- So this is required for the IDEA embedder which
already has its own copy of JDOM --
- excludejdom:jdom/exclude
- excludejtidy:jtidy/exclude
/excludes
/artifactSet
relocations
@@ -216,7 +213,7 @@
plugin
artifactIdshade-maven-plugin/artifactId
groupIdorg.codehaus.mojo/groupId
-version1.0-alpha-10/version
+version1.0-alpha-12/version
executions
execution
phasepackage/phase
svn commit: r571876 - in /maven/components/trunk/maven-embedder: pom.xml src/main/assembly/bin.xml
Author: jvanzyl
Date: Sat Sep 1 14:36:35 2007
New Revision: 571876
URL: http://svn.apache.org/viewvc?rev=571876view=rev
Log:
o putting the old style assembly back as it is too much pain to for the uber jar
Modified:
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/assembly/bin.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=571876r1=571875r2=571876view=diff
==
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Sat Sep 1 14:36:35 2007
@@ -108,7 +108,6 @@
!-- The IDEA folks don't want to put SNAPSHOT libs in their
projects even though they are --
finalNamemaven-embedder-idea-2.1/finalName
createDependencyReducedPomfalse/createDependencyReducedPom
- !-- this will work with shade plugin 1.0-alpha-11-SNAP --
keepDependenciesWithProvidedScopetrue/keepDependenciesWithProvidedScope
transformers
transformer
implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer/
@@ -173,7 +172,6 @@
configuration
finalNamemaven-embedder-tycho-${bundleVersion}/finalName
createDependencyReducedPomfalse/createDependencyReducedPom
- !-- this will work with shade plugin 1.0-alpha-11-SNAP --
keepDependenciesWithProvidedScopetrue/keepDependenciesWithProvidedScope
transformers
transformer
implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer/
@@ -210,46 +208,6 @@
/activation
build
plugins
- plugin
-artifactIdshade-maven-plugin/artifactId
-groupIdorg.codehaus.mojo/groupId
-version1.0-alpha-12/version
-executions
- execution
-phasepackage/phase
-goals
- goalshade/goal
-/goals
-configuration
- shadedArtifactAttachedtrue/shadedArtifactAttached
-
createDependencyReducedPomfalse/createDependencyReducedPom
- !-- this will work with shade plugin 1.0-alpha-11-SNAP --
-
keepDependenciesWithProvidedScopetrue/keepDependenciesWithProvidedScope
- transformers
-transformer
implementation=org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer/
- /transformers
- artifactSet
-excludes
-
excludeorg.codehaus.plexus:plexus-component-api/exclude
- excludeclassworlds:classworlds/exclude
- excludejunit:junit/exclude
- excludejmock:jmock/exclude
- excludexml-apis:xml-apis/exclude
-/excludes
- /artifactSet
- relocations
-relocation
- patternorg.codehaus.plexus.util/pattern
- excludes
-excludeorg.codehaus.plexus.util.xml.Xpp3Dom/exclude
-excludeorg.codehaus.plexus.util.xml.pull.*/exclude
- /excludes
-/relocation
- /relocations
-/configuration
- /execution
-/executions
- /plugin
plugin
artifactIdmaven-assembly-plugin/artifactId
version2.2-beta-1/version
Modified: maven/components/trunk/maven-embedder/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/assembly/bin.xml?rev=571876r1=571875r2=571876view=diff
==
--- maven/components/trunk/maven-embedder/src/main/assembly/bin.xml (original)
+++ maven/components/trunk/maven-embedder/src/main/assembly/bin.xml Sat Sep 1
14:36:35 2007
@@ -31,6 +31,18 @@
includeorg.codehaus.plexus:plexus-classworlds/include
/includes
/dependencySet
+dependencySet
+ outputDirectorylib/outputDirectory
+ excludes
+excludeorg.codehaus.plexus:plexus-classworlds/exclude
+excludeorg.codehaus.plexus:plexus-component-api/exclude
+excludeclassworlds:classworlds/exclude
+excludejunit:junit/exclude
+excludejmock:jmock/exclude
+excludexml-apis:xml-apis/exclude
+excludeorg.apache.maven:maven-artifact/exclude
+ /excludes
+/dependencySet
/dependencySets
fileSets
fileSet
@@ -67,7 +79,7 @@
directorytarget/directory
outputDirectorylib/outputDirectory
svn commit: r571883 - /maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
Author: jvanzyl
Date: Sat Sep 1 14:56:32 2007
New Revision: 571883
URL: http://svn.apache.org/viewvc?rev=571883view=rev
Log:
o removing debug
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java?rev=571883r1=571882r2=571883view=diff
==
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
Sat Sep 1 14:56:32 2007
@@ -20,15 +20,6 @@
*/
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
-
-import java.io.File;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Iterator;
public abstract class AbstractEmbedderTestCase
extends PlexusTestCase
@@ -39,8 +30,6 @@
throws Exception
{
super.setUp();
-
-System.out.println( + getBasedir() );
ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
svn commit: r571884 - in /maven/site/trunk/src/site/apt: download.apt.vm guides/index.apt proposals/incubator/nmaven.apt
Author: dennisl Date: Sat Sep 1 14:58:48 2007 New Revision: 571884 URL: http://svn.apache.org/viewvc?rev=571884view=rev Log: o Set EOL style to native. Modified: maven/site/trunk/src/site/apt/download.apt.vm (props changed) maven/site/trunk/src/site/apt/guides/index.apt (props changed) maven/site/trunk/src/site/apt/proposals/incubator/nmaven.apt (props changed) Propchange: maven/site/trunk/src/site/apt/download.apt.vm -- svn:eol-style = native Propchange: maven/site/trunk/src/site/apt/guides/index.apt -- svn:eol-style = native Propchange: maven/site/trunk/src/site/apt/proposals/incubator/nmaven.apt -- svn:eol-style = native
svn commit: r571885 - in /maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder: execution/ validation/
Author: jvanzyl Date: Sat Sep 1 14:59:30 2007 New Revision: 571885 URL: http://svn.apache.org/viewvc?rev=571885view=rev Log: o sorting tests in packages by execution, validation, and project (to come) Added: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java (contents, props changed) - copied, changed from r571359, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.java (contents, props changed) - copied, changed from r571359, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingScmPluginTest.java (contents, props changed) - copied, changed from r571359, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java (contents, props changed) - copied, changed from r571862, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderCrappySettingsConfigurationTest.java maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/ValidateConfigurationTest.java (contents, props changed) - copied, changed from r571359, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java Copied: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java (from r571359, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java?p2=maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.javap1=maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.javar1=571359r2=571885rev=571885view=diff == --- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java (original) +++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java Sat Sep 1 14:59:30 2007 @@ -1,4 +1,4 @@ -package org.apache.maven.embedder; +package org.apache.maven.embedder.execution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,7 @@ * under the License. */ +import org.apache.maven.embedder.AbstractEmbedderTestCase; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResult; Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java -- svn:eol-style = native Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java -- svn:keywords = Author Date Id Revision Copied: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.java (from r571359, maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.java?p2=maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/EmbedderUsingEclipsePluginTest.javap1=maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.javar1=571359r2=571885rev=571885view=diff == --- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java (original) +++
svn commit: r571886 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Sat Sep 1 15:05:07 2007
New Revision: 571886
URL: http://svn.apache.org/viewvc?rev=571886view=rev
Log:
o Update version number for taglist-maven-plugin.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=571886r1=571885r2=571886view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sat Sep 1 15:05:07 2007
@@ -138,7 +138,7 @@
*---+-+--+
| {{{http://mojo.codehaus.org/sql-maven-plugin/} sql}}
| 1.0 | Executes SQL scripts from files or inline.
*---+-+--+
-| {{{http://mojo.codehaus.org/taglist-maven-plugin/} taglist}}
| 2.0 | Generate a list of tasks based on tags in your code.
+| {{{http://mojo.codehaus.org/taglist-maven-plugin/} taglist}}
| 2.1 | Generate a list of tasks based on tags in your code.
*---+-+--+
svn commit: r571887 - /maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt
Author: dennisl Date: Sat Sep 1 15:14:15 2007 New Revision: 571887 URL: http://svn.apache.org/viewvc?rev=571887view=rev Log: o Correct the name of the directory which the site is deployed to. Modified: maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt Modified: maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt?rev=571887r1=571886r2=571887view=diff == --- maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt (original) +++ maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt Sat Sep 1 15:14:15 2007 @@ -68,7 +68,7 @@ maven-2.0.X$ mvn site-deploy -Preporting +-+ - It will create a new folder maven-2.0.X in /www/maven.apache.org/ref/ on the Apache server. + It will create a new folder 2.0.X in /www/maven.apache.org/ref/ on the Apache server. Note: It will take an hour or so to sync.
svn commit: r571895 - /maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt
Author: dennisl Date: Sat Sep 1 16:17:50 2007 New Revision: 571895 URL: http://svn.apache.org/viewvc?rev=571895view=rev Log: Add more steps: o Update the plugins page o Create the next version in JIRA o Add the release to the board report o Add the release to the wiki Modified: maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt Modified: maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt?rev=571895r1=571894r2=571895view=diff == --- maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt (original) +++ maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt Sat Sep 1 16:17:50 2007 @@ -182,11 +182,18 @@ http://maven.apache.org/plugins/maven-XXX-plugin +-+ - [[9]] Update Jira + [[9]] Update the plugins page - Go to Admin section in Jira for the maven-XXX-plugin project and mark 2.1 version as release. + If this is a plugin release, update the version number for the plugin on the + /plugins/index.html page. - [[10]] Create Announcements. For instance: + [[10]] Update JIRA + + Go to Admin section in JIRA for the maven-XXX-plugin project and mark + the 2.1 version as released. Create version 2.2, if that hasn't already + been done. + + [[11]] Create an Announcement. For instance: +-+ From: YOUR_APACHE_EMAIL @@ -217,4 +224,9 @@ +-+ - [[11]] Celebrate :o) + [[12]] Add the release to the next board report, in the private subversion area. + + [[13]] Add the release to the wiki, under the Recent Releases section of the + front page and on the Releases page. + + [[14]] Celebrate :o)
svn commit: r571896 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: dennisl
Date: Sat Sep 1 16:20:00 2007
New Revision: 571896
URL: http://svn.apache.org/viewvc?rev=571896view=rev
Log:
o Sync with the old release process by adding numbers to the different steps.
o Add missing steps.
o Update the section on using the stage plugin.
Modified:
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=571896r1=571895r2=571896view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Sat Sep 1
16:20:00 2007
@@ -30,9 +30,9 @@
following setup in your $HOME/.m2/settings.xml which is a profile which
provides settings for:
* Your GPG passphrase which will be used to sign all artifacts that are
released. If you have no idea what your
- GPG passphrase is then refer to {{{pmc-release-process.html}this}}.
+ GPG passphrase is then refer to {{{pmc-release-process.html}this document}}.
- * The repository that you want to deploy the release to.
+ * The staging repository that you want to deploy the release to.
Here's what your release profile might look like in your
$HOME/.m2/settings.xml:
@@ -61,15 +61,55 @@
%{snippet|id=release-profile|url=http://svn.apache.org/repos/asf/maven/pom/trunk/maven/pom.xml}
- All you need to do in order to release are the familiar
-
+* The New Steps
+
+ The following steps replace steps 2-7 in the
+ {{{./pmc-release-process.html}old release process}}.
+
+ [[1]] Prepare the release
+
+-+
mvn release:prepare
++-+
+
+ [[2]] Perform the release
++-+
mvn release:perform
+-+
-Copying from the staging repo to the production repo
+ [[3]] Propose a vote on the dev list with the closed issues, the issues left,
+ the staging repository and the staging site. For instance:
+
++-+
+To: Maven Developers List [EMAIL PROTECTED]
+Subject: [VOTE] Release Maven XXX plugin version 2.1
+
+Hi,
+
+We solved N issues:
+http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=XXXstyleName=Htmlversion=XXX
+
+There are still a couple of issues left in JIRA:
+http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=truepid=XXXstatus=1
+
+Staging repo:
+http://people.apache.org/~YOUR_APACHE_USERNAME/staging-repo/maven-XXX-plugin/
+
+Staging site:
+http://people.apache.org/~YOUR_APACHE_USERNAME/maven-XXX-plugin/
+
+Vote open for 72 hours.
+
+[ ] +1
+[ ] +0
+[ ] -1
+
++-+
+
+ Once a vote is successful, post the result to the dev list and cc the pmc.
+
+ [[4]] Copy from the staging repo to the production repo
Once the release is deemed fit for public consumption it can be transfered to
a production repository where it will
be available to all users.
@@ -82,20 +122,17 @@
Here is an example on how to use the stage plugin:
+-+
-mvn stage:copy -Dsource=http://people.apache.org/~carlos/staging-repo;
-Dtarget=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
-Dversion=2.3 -DrepositoryId=apache.releases
+mvn stage:copy -Dsource=http://people.apache.org/~carlos/staging-repo; \
+
-Dtarget=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
\
+ -Dversion=2.3 \
+ -DtargetRepositoryId=apache.releases
+-+
- Note: For some reason the repositoryId configuration parameter
doesn't work yet.
- The repositoryId parameter is required if you need the the plugin to
use the server configuration from your settings file (username, password etc.).
- The version parameter seems to be ignored and the entire repository
is synced, not just the given version or the current project.
+ Note: The version parameter is currently ignored and the entire
+ staging repository is synced, not just the given version or the current
+ project. It still needs to be provided, though.
- Work-around: Until the repositoryId problem has been solved you can
specify your username in the target URL like this:
-
-+-+
-mvn stage:copy -Dsource=http://people.apache.org/~carlos/staging-repo;
-Dtarget=scp://[EMAIL
PROTECTED]/www/people.apache.org/repo/m2-ibiblio-rsync-repository
-Dversion=2.3 -DrepositoryId=apache.releases
-+-+
-
-Releasing a Project Directly into a Production Repository
+ Releasing a Project Directly into a Production Repository
If you want to release directly to a production repository then you simply
configure the staging repository point at
the production repository by using the following in your
$HOME/.m2/settings.xml:
@@ -118,3 +155,10 @@
This will allow you to bypass the staging phase and push the release directly
into a production repository. It is assume that
you have pushed a snapshot somewhere that people have looked at and
svn commit: r571897 - in /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution: DefaultMavenExecutionRequestPopulator.java MavenExecutionRequestPopulator.java
Author: jvanzyl
Date: Sat Sep 1 16:21:29 2007
New Revision: 571897
URL: http://svn.apache.org/viewvc?rev=571897view=rev
Log:
o renaming to populator as I'm going to put a few more pieces that are
currently instantiate but should be components like the profile manager. I will
move this out of DefaultMaven and put it in the request to be shared in the
session.
Added:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(contents, props changed)
- copied, changed from r571359,
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java
(contents, props changed)
- copied, changed from r571359,
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java
Copied:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(from r571359,
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?p2=maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.javap1=maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.javar1=571359r2=571897rev=571897view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Sat Sep 1 16:21:29 2007
@@ -20,7 +20,6 @@
*/
import org.apache.maven.SettingsConfigurationException;
-import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -35,6 +34,7 @@
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.usability.SystemWarnings;
+import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import
org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
@@ -50,13 +50,13 @@
import java.util.Iterator;
/**
- * DefaultMavenExecutionRequestDefaultsPopulator
+ * DefaultMavenExecutionRequestPopulator
*
* @version $Id$
*/
-public class DefaultMavenExecutionRequestDefaultsPopulator
+public class DefaultMavenExecutionRequestPopulator
extends AbstractLogEnabled
-implements MavenExecutionRequestDefaultsPopulator, Contextualizable
+implements MavenExecutionRequestPopulator, Contextualizable
{
private ArtifactRepositoryFactory artifactRepositoryFactory;
Propchange:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
--
svn:eol-style = native
Propchange:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
--
svn:keywords = Author Date Id Revision
Copied:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java
(from r571359,
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java?p2=maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.javap1=maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.javar1=571359r2=571897rev=571897view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java
(original)
+++
svn commit: r571900 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Sat Sep 1 16:58:58 2007 New Revision: 571900 URL: http://svn.apache.org/viewvc?rev=571900view=rev Log: o The next release will be 2.0-beta-6 according to JIRA. 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=571900r1=571899r2=571900view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Sep 1 16:58:58 2007 @@ -28,7 +28,7 @@ artifactIdmaven-site-plugin/artifactId packagingmaven-plugin/packaging nameMaven Site plugin/name - version2.0-SNAPSHOT/version + version2.0-beta-6-SNAPSHOT/version prerequisites maven2.0/maven /prerequisites
svn commit: r571901 - /maven/components/trunk/maven-embedder/embedder-tycho.sh
Author: jvanzyl Date: Sat Sep 1 17:00:32 2007 New Revision: 571901 URL: http://svn.apache.org/viewvc?rev=571901view=rev Log: o script for creating the eclipse integration jar Added: maven/components/trunk/maven-embedder/embedder-tycho.sh (with props) Added: maven/components/trunk/maven-embedder/embedder-tycho.sh URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/embedder-tycho.sh?rev=571901view=auto == --- maven/components/trunk/maven-embedder/embedder-tycho.sh (added) +++ maven/components/trunk/maven-embedder/embedder-tycho.sh Sat Sep 1 17:00:32 2007 @@ -0,0 +1,16 @@ +#!/bin/sh + +ds=`date +2.1.0.v%Y%m%d-%H%M` +dir=`pwd` + +mvn clean + +( + cd .. + mvn source:aggregate + mkdir -p $dir/target + mv target/maven-2.1-SNAPSHOT-sources.jar $dir/target/maven-embedder-tycho-$ds-depsrc.zip +) + +sed s@bundleVersion.*/bundleVersion@bundleVersion$ds/bundleVersion@ pom.xml tmp; mv tmp pom.xml +mvn -Dmaven.test.skip=true -Ptycho package Propchange: maven/components/trunk/maven-embedder/embedder-tycho.sh -- svn:eol-style = native Propchange: maven/components/trunk/maven-embedder/embedder-tycho.sh -- svn:executable = * Propchange: maven/components/trunk/maven-embedder/embedder-tycho.sh -- svn:keywords = Author Date Id Revision
svn commit: r571902 - in /maven/components/trunk/maven-embedder/src: main/java/org/apache/maven/embedder/ main/java/org/apache/maven/embedder/execution/ main/resources/META-INF/plexus/ test/java/org/a
Author: jvanzyl
Date: Sat Sep 1 17:01:02 2007
New Revision: 571902
URL: http://svn.apache.org/viewvc?rev=571902view=rev
Log:
o separate out the embedder tests into packages by concern
Added:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/MavenEmbedderProjectNotInRepositoryTest.java
- copied, changed from r571862,
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java
Removed:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingEclipsePluginTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderCrappySettingsConfigurationTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=571902r1=571901r2=571902view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Sat Sep 1 17:01:02 2007
@@ -34,7 +34,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolver;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.context.BuildContextManager;
-import
org.apache.maven.embedder.execution.MavenExecutionRequestDefaultsPopulator;
+import org.apache.maven.embedder.execution.MavenExecutionRequestPopulator;
import org.apache.maven.embedder.writer.WriterUtils;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -95,7 +95,6 @@
import java.io.Reader;
import java.io.Writer;
import java.net.URL;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -159,7 +158,7 @@
private MavenSettingsBuilder settingsBuilder;
-private MavenExecutionRequestDefaultsPopulator defaultsPopulator;
+private MavenExecutionRequestPopulator populator;
// --
// Configuration
@@ -426,7 +425,7 @@
try
{
-request = defaultsPopulator.populateDefaults( request, this );
+request = populator.populateDefaults( request, this );
//mkleint: copied from DefaultLifecycleExecutor
project = readProject( new File( request.getPomFile() ) );
@@ -458,7 +457,7 @@
}
catch ( ProjectBuildingException e )
{
-
+result.addException( e );
}
result.setProject( r.getProject() );
@@ -645,8 +644,8 @@
defaultArtifactRepositoryLayout =
(ArtifactRepositoryLayout) container.lookup(
ArtifactRepositoryLayout.ROLE, DEFAULT_LAYOUT_ID );
-defaultsPopulator = (MavenExecutionRequestDefaultsPopulator)
container.lookup(
-MavenExecutionRequestDefaultsPopulator.ROLE );
+populator = (MavenExecutionRequestPopulator) container.lookup(
+MavenExecutionRequestPopulator.ROLE );
artifactHandlerManager = (ArtifactHandlerManager)
container.lookup( ArtifactHandlerManager.ROLE );
@@ -925,7 +924,7 @@
try
{
-request = defaultsPopulator.populateDefaults( request, this );
+request = populator.populateDefaults( request, this );
}
catch ( MavenEmbedderException e )
{
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
svn commit: r571903 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven: DefaultMaven.java execution/DefaultMavenExecutionRequest.java execution/MavenExecutionRequest.java
Author: jvanzyl
Date: Sat Sep 1 17:01:30 2007
New Revision: 571903
URL: http://svn.apache.org/viewvc?rev=571903view=rev
Log:
o the profile manager creation now happens up front in the embedder
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=571903r1=571902r2=571903view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Sat Sep 1 17:01:30 2007
@@ -129,13 +129,6 @@
// old doExecute
-ProfileManager globalProfileManager = new DefaultProfileManager(
container, request.getProperties() );
-
-globalProfileManager.loadSettingsProfiles( request.getSettings() );
-
-globalProfileManager.explicitlyActivate( request.getActiveProfiles() );
-
-globalProfileManager.explicitlyDeactivate(
request.getInactiveProfiles() );
getLogger().info( Scanning for projects... );
@@ -145,7 +138,7 @@
try
{
-projects = getProjects( request, globalProfileManager );
+projects = getProjects( request );
if ( projects.isEmpty() )
{
@@ -332,7 +325,7 @@
return superProject;
}
-private List getProjects( MavenExecutionRequest request, ProfileManager
globalProfileManager )
+private List getProjects( MavenExecutionRequest request )
throws MavenExecutionException, BuildFailureException
{
List projects;
@@ -351,7 +344,7 @@
// instances just-in-time.
try
{
-buildExtensionScanner.scanForBuildExtensions( files,
request.getLocalRepository(), globalProfileManager );
+buildExtensionScanner.scanForBuildExtensions( files,
request.getLocalRepository(), request.getProfileManager() );
}
catch ( ExtensionScanningException e )
{
@@ -361,7 +354,7 @@
try
{
projects = collectProjects( files, request.getLocalRepository(),
request.isRecursive(),
-request.getSettings(),
globalProfileManager, !request.useReactor() );
+request.getSettings(),
request.getProfileManager(), !request.useReactor() );
}
catch ( ArtifactResolutionException e )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=571903r1=571902r2=571903view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Sat Sep 1 17:01:30 2007
@@ -21,6 +21,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.monitor.event.EventMonitor;
+import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
@@ -93,6 +94,8 @@
private boolean updateSnapshots = false;
+private ProfileManager profileManager;
+
/**
* Suppress SNAPSHOT updates.
* @issue MNG-2681
@@ -501,5 +504,17 @@
public Settings getSettings()
{
return settings;
+}
+
+public ProfileManager getProfileManager()
+{
+return profileManager;
+}
+
+public MavenExecutionRequest setProfileManager( ProfileManager
profileManager )
+{
+this.profileManager = profileManager;
+
+return this;
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=571903r1=571902r2=571903view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
svn commit: r571905 - in /maven/components/trunk/maven-embedder/src/test/projects: ./ no-artifact-in-repository-test/ no-artifact-in-repository-test/child-1/ no-artifact-in-repository-test/child-1/src
Author: jvanzyl Date: Sat Sep 1 17:02:23 2007 New Revision: 571905 URL: http://svn.apache.org/viewvc?rev=571905view=rev Log: o a project to test the resolution of projects when they are not installed in the local repository. this makes sure that IDE integration works for newly created projects that have inter-module dependencies. Added: maven/components/trunk/maven-embedder/src/test/projects/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/pom.xml (with props) maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/main/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/main/java/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/main/java/org/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/main/java/org/apache/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/main/java/org/apache/maven/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/main/java/org/apache/maven/test/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/main/java/org/apache/maven/test/App.java (with props) maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/test/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/test/java/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/test/java/org/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/test/java/org/apache/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/test/java/org/apache/maven/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/test/java/org/apache/maven/test/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/src/test/java/org/apache/maven/test/AppTest.java (with props) maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/pom.xml (with props) maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/main/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/main/java/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/main/java/org/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/main/java/org/apache/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/main/java/org/apache/maven/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/main/java/org/apache/maven/test/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/main/java/org/apache/maven/test/App.java (with props) maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/test/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/test/java/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/test/java/org/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/test/java/org/apache/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/test/java/org/apache/maven/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/test/java/org/apache/maven/test/ maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-2/src/test/java/org/apache/maven/test/AppTest.java (with props) maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/pom.xml (with props) Added: maven/components/trunk/maven-embedder/src/test/projects/no-artifact-in-repository-test/child-1/pom.xml
svn commit: r571907 - /maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Author: jvanzyl Date: Sat Sep 1 17:11:37 2007 New Revision: 571907 URL: http://svn.apache.org/viewvc?rev=571907view=rev Log: o removing the release profile from the Super POM, this is for our particular flavor of releasing and the Super POM should stand as defaults for everyone using Maven. We should never again put profiles into the Super POM, it's just a bad idea. It forces us to inject the profile manager into the reading of the SuperPOM which is also bad. Modified: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Modified: maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=571907r1=571906r2=571907view=diff == --- maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml (original) +++ maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Sat Sep 1 17:11:37 2007 @@ -27,10 +27,7 @@ idcentral/id nameMaven Repository Switchboard/name layoutdefault/layout - !-- - urlhttp://www.ibiblio.org/maven2/url - -- -urlhttp://repo1.maven.org/maven2/url + urlhttp://repo1.maven.org/maven2/url snapshots enabledfalse/enabled /snapshots @@ -41,10 +38,7 @@ pluginRepository idcentral/id nameMaven Plugin Repository/name - !-- - urlhttp://www.ibiblio.org/maven2/url - -- -urlhttp://repo1.maven.org/maven2/url + urlhttp://repo1.maven.org/maven2/url layoutdefault/layout snapshots enabledfalse/enabled @@ -78,61 +72,5 @@ reporting outputDirectorytarget/site/outputDirectory /reporting - - profiles -profile - idrelease-profile/id - - activation -property - nameperformRelease/name - valuetrue/value -/property - /activation - - build -plugins - plugin -inheritedtrue/inherited -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-source-plugin/artifactId - -executions - execution -idattach-sources/id -goals - goaljar/goal -/goals - /execution -/executions - /plugin - plugin -inheritedtrue/inherited -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-javadoc-plugin/artifactId - -executions - execution -idattach-javadocs/id -goals - goaljar/goal -/goals - /execution -/executions - /plugin - plugin -inheritedtrue/inherited -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-deploy-plugin/artifactId - -configuration - updateReleaseInfotrue/updateReleaseInfo -/configuration - /plugin -/plugins - /build -/profile - /profiles - /project -!-- END SNIPPET: superpom -- + !-- END SNIPPET: superpom --
svn commit: r571910 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/extension/ maven-project/src/main/java/org/apache/maven/project/
Author: jvanzyl
Date: Sat Sep 1 17:56:30 2007
New Revision: 571910
URL: http://svn.apache.org/viewvc?rev=571910view=rev
Log:
o as the profile has been removed from the super pom, we do not need to inject
or process any profiles
related to it. this great simplifies a lot of code
o caching the super project in the default project builder as it's never going
to change now as no profiles
are inject so it will only have to be constructed once an instance.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=571910r1=571909r2=571910view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Sat Sep 1 17:56:30 2007
@@ -127,9 +127,6 @@
MavenExecutionResult result = new DefaultMavenExecutionResult();
-// old doExecute
-
-
getLogger().info( Scanning for projects... );
boolean foundProjects = true;
@@ -174,6 +171,9 @@
return result;
}
+// Display the order of the projects
+//CLI:move
+
if ( reactorManager.hasMultipleProjects() )
{
getLogger().info( Reactor build order: );
@@ -313,9 +313,7 @@
MavenProject superProject;
try
{
-superProject = projectBuilder.buildStandaloneSuperProject(
request.getLocalRepository(),
- new
DefaultProfileManager( container,
-
request.getProperties() ) );
+superProject = projectBuilder.buildStandaloneSuperProject();
}
catch ( ProjectBuildingException e )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=571910r1=571909r2=571910view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Sat Sep 1 17:56:30 2007
@@ -115,6 +115,7 @@
Map inheritedInterpolationValues = new HashMap();
List inheritedRemoteRepositories = new ArrayList();
+
inheritedRemoteRepositories.addAll( originalRemoteRepositories );
for ( ModelLineageIterator lineageIterator =
lineage.reversedLineageIterator(); lineageIterator.hasNext(); )
@@ -345,9 +346,10 @@
throws ExtensionScanningException
{
MavenProject superProject;
+
try
{
-superProject = projectBuilder.buildStandaloneSuperProject(
localRepository, globalProfileManager );
+superProject = projectBuilder.buildStandaloneSuperProject();
}
catch ( ProjectBuildingException e )
{
@@ -355,6 +357,8 @@
Error building super-POM
for retrieving the default remote repository list:
+ e.getMessage(), e );
}
+
+System.out.println( superProject = + superProject );
return superProject.getRemoteArtifactRepositories();
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=571910r1=571909r2=571910view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
svn commit: r571912 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Author: jvanzyl
Date: Sat Sep 1 18:20:15 2007
New Revision: 571912
URL: http://svn.apache.org/viewvc?rev=571912view=rev
Log:
o don't need the private method anymore for getting the super pom
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=571912r1=571911r2=571912view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Sat Sep 1 18:20:15 2007
@@ -139,7 +139,7 @@
if ( projects.isEmpty() )
{
-projects.add( getSuperProject( request ) );
+projects.add( projectBuilder.buildStandaloneSuperProject() );
foundProjects = false;
}
@@ -305,22 +305,6 @@
line();
}
-}
-
-private MavenProject getSuperProject( MavenExecutionRequest request )
-throws MavenExecutionException
-{
-MavenProject superProject;
-try
-{
-superProject = projectBuilder.buildStandaloneSuperProject();
-
-}
-catch ( ProjectBuildingException e )
-{
-throw new MavenExecutionException( e.getMessage(), e );
-}
-return superProject;
}
private List getProjects( MavenExecutionRequest request )
svn commit: r571913 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0013/pom.xml
Author: jvanzyl Date: Sat Sep 1 18:30:52 2007 New Revision: 571913 URL: http://svn.apache.org/viewvc?rev=571913view=rev Log: o just put the artifacts in the local repo like all the other tests. eventually they all need to be run with a clean repo Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0013/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0013/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0013/pom.xml?rev=571913r1=571912r2=571913view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0013/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0013/pom.xml Sat Sep 1 18:30:52 2007 @@ -24,11 +24,4 @@ scopetest/scope /dependency /dependencies - distributionManagement -repository - idcentral/id - nameTest Repository/name - urlfile:/tmp/testRepo/url -/repository - /distributionManagement /project
svn commit: r571914 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/pom.xml
Author: jvanzyl Date: Sat Sep 1 18:32:18 2007 New Revision: 571914 URL: http://svn.apache.org/viewvc?rev=571914view=rev Log: o use the local repo like everything else. all ITs will be run with a separate repo as a group in a given profile. Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/pom.xml?rev=571914r1=571913r2=571914view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0020/pom.xml Sat Sep 1 18:32:18 2007 @@ -35,11 +35,4 @@ /resource /resources /build - distributionManagement -repository - idcentral/id - nameTest Repository/name - urlfile:/tmp/testRepo/url -/repository - /distributionManagement /project
svn commit: r571915 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Author: dennisl
Date: Sat Sep 1 18:38:34 2007
New Revision: 571915
URL: http://svn.apache.org/viewvc?rev=571915view=rev
Log:
[MSITE-201] ${modules} renders as [] causing parse error
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=571915r1=571914r2=571915view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Sat Sep 1 18:38:34 2007
@@ -44,6 +44,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -861,6 +862,17 @@
protected String getInterpolatedSiteDescriptorContent( Map props,
MavenProject aProject, String siteDescriptorContent )
throws IOException
{
+// MSITE-201: The ObjectBasedValueSource( aProject ) below will match
+// ${modules} to aProject.getModules(), so we need to interpolate that
+// first.
+
+Map modulesProps = new HashMap();
+
+// Legacy for the old ${modules} syntax
+modulesProps.put( modules, menu ref=\modules\/ );
+
+siteDescriptorContent = StringUtils.interpolate(
siteDescriptorContent, modulesProps );
+
RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
interpolator.addValueSource( new EnvarBasedValueSource() );
@@ -877,9 +889,6 @@
// Legacy for the old ${parentProject} syntax
props.put( parentProject, menu ref=\parent\/ );
-
-// Legacy for the old ${modules} syntax
-props.put( modules, menu ref=\modules\/ );
// Legacy for the old ${reports} syntax
props.put( reports, menu ref=\reports\/ );
svn commit: r571916 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Sat Sep 1 18:41:23 2007 New Revision: 571916 URL: http://svn.apache.org/viewvc?rev=571916view=rev Log: o Set the correct maven version in prerequisites. 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=571916r1=571915r2=571916view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Sep 1 18:41:23 2007 @@ -30,7 +30,7 @@ nameMaven Site plugin/name version2.0-beta-6-SNAPSHOT/version prerequisites -maven2.0/maven +maven2.0.2/maven /prerequisites issueManagement systemJIRA/system
svn commit: r571919 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Author: jvanzyl
Date: Sat Sep 1 19:13:00 2007
New Revision: 571919
URL: http://svn.apache.org/viewvc?rev=571919view=rev
Log:
o remove debug output
o we don't need any but the super pom now for getting the initial repositories
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=571919r1=571918r2=571919view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Sat Sep 1 19:13:00 2007
@@ -105,7 +105,7 @@
try
{
-List originalRemoteRepositories = getInitialRemoteRepositories(
localRepository, globalProfileManager );
+List originalRemoteRepositories = getInitialRemoteRepositories();
getLogger().debug( Pre-scanning POM lineage of: + pom + for
build extensions. );
@@ -342,7 +342,7 @@
return lineage;
}
-private List getInitialRemoteRepositories( ArtifactRepository
localRepository, ProfileManager globalProfileManager )
+private List getInitialRemoteRepositories()
throws ExtensionScanningException
{
MavenProject superProject;
@@ -357,8 +357,6 @@
Error building super-POM
for retrieving the default remote repository list:
+ e.getMessage(), e );
}
-
-System.out.println( superProject = + superProject );
return superProject.getRemoteArtifactRepositories();
}
