brett 2004/11/08 00:22:24
Modified: xdocs Tag: MAVEN-1_0-BRANCH changes.xml
src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
revert MAVEN-1467 as it broke checkstyle - it did not properly respect the
project.properties file.
Too risky for 1.0.1 release.
Revision Changes Path
No revision
No revision
1.14.4.49 +0 -1 maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/changes.xml,v
retrieving revision 1.14.4.48
retrieving revision 1.14.4.49
diff -u -r1.14.4.48 -r1.14.4.49
--- changes.xml 6 Nov 2004 07:33:25 -0000 1.14.4.48
+++ changes.xml 8 Nov 2004 08:22:24 -0000 1.14.4.49
@@ -27,7 +27,6 @@
<release version="1.0.1-SNAPSHOT" date="in CVS MAVEN-1_0-BRANCH">
<action dev="brett" type="fix" issue="MAVEN-1471">Move dependency
verification until the point where the project is in a consistent state, so
that the reactor succeeds when ignoreFailures is true</action>
<action dev="brett" type="fix">Upgrade to Ant Tag Library 1.0 to avoid
an error when the ant project is in a certain state</action>
- <action dev="brett" type="fix" issue="MAVEN-1467">Properly inherit
properties in plugin contexts, so that maven:set can be called before the
plugin is initialised</action>
<action dev="brett" type="fix" issue="MAVEN-1427">Improve plugin
dependency handling by removing old plugins before using a different
version</action>
<action dev="brett" type="fix" issue="MAVEN-1422" due-to="Eric
Lapierre">Fix inheritence inside the reactor over multiple levels</action>
<action dev="brett" type="fix" issue="MAVEN-1405" due-to="Philipp
Kohl">Use preemptive authentication when there are some credentials, so the
first 403 is really forbidden.</action>
No revision
No revision
1.70.4.60 +4 -3 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.59
retrieving revision 1.70.4.60
diff -u -r1.70.4.59 -r1.70.4.60
--- PluginManager.java 6 Nov 2004 09:11:37 -0000 1.70.4.59
+++ PluginManager.java 8 Nov 2004 08:22:24 -0000 1.70.4.60
@@ -729,8 +729,9 @@
// TODO: I think this should merge into pluginContext, but that
seems to break existing jelly as it depends on
// that kind of warped scoping. Fix this in 1.1
-// MavenUtils.integrateMapInContext( housing.getPluginProperties(),
baseContext );
+ MavenUtils.integrateMapInContext( housing.getPluginProperties(),
baseContext );
+ /*
// Instead, we must go through each property and merge from previous
plugin contexts, or the original property
// first integrate new ones
MavenUtils.integrateMapInContext(
project.getContext().getVariables(), baseContext );
@@ -751,7 +752,7 @@
}
MavenUtils.integrateMapInContext( p, baseContext );
// but leave alone anything in there that is not a plugin property,
and already exists in baseContext
-
+*/
// TODO necessary to create a new one every time?
MavenJellyContext pluginContext = new MavenJellyContext( baseContext
);
project.pushContext( pluginContext );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
