brett 2004/05/05 06:05:55
Modified: . build-bootstrap.xml maven.xml project.properties
project.xml
maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven
MavenTag.java MavenTagLibrary.java
PluginVarTag.java ReactorTag.java
src/bin maven
src/conf defaults.properties
src/java/org/apache/maven DependencyClasspathBuilder.java
MavenConstants.java MavenSession.java
MavenUtils.java
src/java/org/apache/maven/cli App.java CLIManager.java
src/java/org/apache/maven/jelly JellyBuildListener.java
JellyPropsHandler.java JellyUtils.java
MavenExpressionFactory.java MavenJellyContext.java
src/java/org/apache/maven/jelly/tags/werkz
MavenAttainGoalTag.java MavenGoalTag.java
src/java/org/apache/maven/plugin
GoalToJellyScriptHousingMapper.java
JellyScriptHousing.java PluginCacheManager.java
PluginDefinitionHandler.java PluginManager.java
PluginScriptParser.java
src/java/org/apache/maven/project Build.java
Contributor.java PackageGroup.java Project.java
Repository.java
src/java/org/apache/maven/util
CaseInsensitiveGlobPatternMapper.java
DVSLFormatter.java DVSLPathTool.java
EnhancedStringTokenizer.java Expand.java
HttpUtils.java MD5Sum.java MavenTool.java
ResourceBean.java StringTool.java
src/java/org/apache/maven/verifier
ChecksumVerificationException.java
DependencyVerifier.java LocalSettingsVerifier.java
src/test/java/org/apache/maven/plugin
PluginCacheManagerTest.java forehead.conf
src/test/java/org/apache/maven/plugin/maven.home/plugins/jar/META-INF
MANIFEST.MF
src/test/touchstone-build maven.xml project.xml
src/test/touchstone-build/src/reactor-build/default
maven.xml
src/test/touchstone-build/src/reactor-build/inheritence
maven.xml
src/test/touchstone-build/src/reactor-build/inheritence/subproject
maven.xml
src/test/touchstone-build/src/reactor-build/inheritence/subproject/subproject2
maven.xml
src/test/touchstone-build/src/reactor-build/resources
NOTES.txt
src/test/touchstone-build/src/reactor-build/run_twice
NOTES.txt
xdocs changes.xml development-process.xml navigation.xml
repository-upload.xml status.xml
xdocs/misc articles.xml
xdocs/reference dirlayout.xml project-descriptor.xml
user-guide.xml
xdocs/start bootstrap.xml download.xml install.xml
Added: announcements 1.0-rc2.ann
maven-jelly-tags .cvsignore project.properties project.xml
maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven
GetTag.java InstallPluginTag.java SetTag.java
UninstallPluginTag.java
maven-jelly-tags/xdocs changes.xml index.xml navigation.xml
src/java/org/apache/maven/util Base64.java
src/test/touchstone-build/src/reactor-build/default
project.properties
xdocs cvs-status.xml
xdocs/start release-notes.xml
Removed: src/java/org/apache/maven/jelly/tags BaseTagLibrary.java
BaseTagSupport.java package.html
src/java/org/apache/maven/jelly/tags/maven AddPathTag.java
ConcatTag.java CopyResources.java
DependencyResolver.java
DependencyResolverInterface.java
GraphDependencyResolver.java InputTag.java
MakeAbsolutePathTag.java MakeRelativePathTag.java
MavenTag.java MavenTagLibrary.java ParamCheck.java
PluginVarTag.java PomTag.java PropertyTag.java
ReactorTag.java RootRelativePathTag.java
SnapshotSignature.java UserCheck.java
WerkzDependencyResolver.java package.html
src/test/java/org/apache/maven/jelly/tags/maven
DependencyResolverTest.java
DependencyResolverTestData.java
RootRelativePathTagTest.java
xdocs/reference/plugins index.xml
Log:
merge changes between MAVEN_1_0_RC2 and MAVEN-1_0-BRANCH-merge-3
Revision Changes Path
1.215 +1 -0 maven/build-bootstrap.xml
http://cvs.apache.org/viewcvs/maven/build-bootstrap.xml.diff?r1=1.214&r2=1.215
1.102 +3 -1 maven/maven.xml
http://cvs.apache.org/viewcvs/maven/maven.xml.diff?r1=1.101&r2=1.102
1.61 +9 -13 maven/project.properties
http://cvs.apache.org/viewcvs/maven/project.properties.diff?r1=1.60&r2=1.61
1.331 +17 -5 maven/project.xml
http://cvs.apache.org/viewcvs/maven/project.xml.diff?r1=1.330&r2=1.331
1.2 +63 -0 maven/announcements/1.0-rc2.ann
http://cvs.apache.org/viewcvs/maven/announcements/1.0-rc2.ann.diff?r1=1.1&r2=1.2
1.2 +1 -0 maven/maven-jelly-tags/.cvsignore
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/.cvsignore.diff?r1=1.1&r2=1.2
1.2 +7 -0 maven/maven-jelly-tags/project.properties
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/project.properties.diff?r1=1.1&r2=1.2
1.2 +234 -0 maven/maven-jelly-tags/project.xml
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/project.xml.diff?r1=1.1&r2=1.2
1.14 +1 -2
maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/MavenTag.java
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/MavenTag.java.diff?r1=1.13&r2=1.14
1.16 +5 -1
maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/MavenTagLibrary.java
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/MavenTagLibrary.java.diff?r1=1.15&r2=1.16
1.5 +8 -0
maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/PluginVarTag.java
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/PluginVarTag.java.diff?r1=1.4&r2=1.5
1.39 +97 -20
maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/ReactorTag.java
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/ReactorTag.java.diff?r1=1.38&r2=1.39
1.2 +128 -0
maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/GetTag.java
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/GetTag.java.diff?r1=1.1&r2=1.2
1.2 +70 -0
maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/InstallPluginTag.java
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/InstallPluginTag.java.diff?r1=1.1&r2=1.2
1.2 +127 -0
maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/SetTag.java
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/SetTag.java.diff?r1=1.1&r2=1.2
1.2 +64 -0
maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/UninstallPluginTag.java
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/UninstallPluginTag.java.diff?r1=1.1&r2=1.2
1.2 +33 -0 maven/maven-jelly-tags/xdocs/changes.xml
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/xdocs/changes.xml.diff?r1=1.1&r2=1.2
1.2 +41 -0 maven/maven-jelly-tags/xdocs/index.xml
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/xdocs/index.xml.diff?r1=1.1&r2=1.2
1.2 +35 -0 maven/maven-jelly-tags/xdocs/navigation.xml
http://cvs.apache.org/viewcvs/maven/maven-jelly-tags/xdocs/navigation.xml.diff?r1=1.1&r2=1.2
1.34 +16 -26 maven/src/bin/maven
http://cvs.apache.org/viewcvs/maven/src/bin/maven.diff?r1=1.33&r2=1.34
1.10 +2 -0 maven/src/conf/defaults.properties
http://cvs.apache.org/viewcvs/maven/src/conf/defaults.properties.diff?r1=1.9&r2=1.10
1.16 +2 -5 maven/src/java/org/apache/maven/DependencyClasspathBuilder.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/DependencyClasspathBuilder.java.diff?r1=1.15&r2=1.16
1.33 +7 -1 maven/src/java/org/apache/maven/MavenConstants.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/MavenConstants.java.diff?r1=1.32&r2=1.33
1.22 +18 -1 maven/src/java/org/apache/maven/MavenSession.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/MavenSession.java.diff?r1=1.21&r2=1.22
1.110 +115 -66 maven/src/java/org/apache/maven/MavenUtils.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/MavenUtils.java.diff?r1=1.109&r2=1.110
1.40 +296 -198 maven/src/java/org/apache/maven/cli/App.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/cli/App.java.diff?r1=1.39&r2=1.40
1.15 +12 -1 maven/src/java/org/apache/maven/cli/CLIManager.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/cli/CLIManager.java.diff?r1=1.14&r2=1.15
1.7 +3 -4 maven/src/java/org/apache/maven/jelly/JellyBuildListener.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/JellyBuildListener.java.diff?r1=1.6&r2=1.7
1.10 +1 -1 maven/src/java/org/apache/maven/jelly/JellyPropsHandler.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/JellyPropsHandler.java.diff?r1=1.9&r2=1.10
1.19 +27 -10 maven/src/java/org/apache/maven/jelly/JellyUtils.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/JellyUtils.java.diff?r1=1.18&r2=1.19
1.14 +2 -3
maven/src/java/org/apache/maven/jelly/MavenExpressionFactory.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/MavenExpressionFactory.java.diff?r1=1.13&r2=1.14
1.38 +59 -19 maven/src/java/org/apache/maven/jelly/MavenJellyContext.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/MavenJellyContext.java.diff?r1=1.37&r2=1.38
1.5 +12 -15
maven/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalTag.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalTag.java.diff?r1=1.4&r2=1.5
1.5 +23 -12
maven/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java.diff?r1=1.4&r2=1.5
1.7 +65 -17
maven/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java.diff?r1=1.6&r2=1.7
1.7 +80 -15 maven/src/java/org/apache/maven/plugin/JellyScriptHousing.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/plugin/JellyScriptHousing.java.diff?r1=1.6&r2=1.7
1.20 +316 -110 maven/src/java/org/apache/maven/plugin/PluginCacheManager.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/plugin/PluginCacheManager.java.diff?r1=1.19&r2=1.20
1.4 +2 -3
maven/src/java/org/apache/maven/plugin/PluginDefinitionHandler.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/plugin/PluginDefinitionHandler.java.diff?r1=1.3&r2=1.4
1.74 +327 -218 maven/src/java/org/apache/maven/plugin/PluginManager.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/plugin/PluginManager.java.diff?r1=1.73&r2=1.74
1.5 +43 -3 maven/src/java/org/apache/maven/plugin/PluginScriptParser.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/plugin/PluginScriptParser.java.diff?r1=1.4&r2=1.5
1.28 +2 -2 maven/src/java/org/apache/maven/project/Build.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/project/Build.java.diff?r1=1.27&r2=1.28
1.10 +2 -5 maven/src/java/org/apache/maven/project/Contributor.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/project/Contributor.java.diff?r1=1.9&r2=1.10
1.4 +8 -8 maven/src/java/org/apache/maven/project/PackageGroup.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/project/PackageGroup.java.diff?r1=1.3&r2=1.4
1.97 +5 -2 maven/src/java/org/apache/maven/project/Project.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/project/Project.java.diff?r1=1.96&r2=1.97
1.21 +4 -4 maven/src/java/org/apache/maven/project/Repository.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/project/Repository.java.diff?r1=1.20&r2=1.21
1.4 +11 -8
maven/src/java/org/apache/maven/util/CaseInsensitiveGlobPatternMapper.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/CaseInsensitiveGlobPatternMapper.java.diff?r1=1.3&r2=1.4
1.5 +3 -3 maven/src/java/org/apache/maven/util/DVSLFormatter.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/DVSLFormatter.java.diff?r1=1.4&r2=1.5
1.4 +16 -17 maven/src/java/org/apache/maven/util/DVSLPathTool.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/DVSLPathTool.java.diff?r1=1.3&r2=1.4
1.4 +30 -15
maven/src/java/org/apache/maven/util/EnhancedStringTokenizer.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/EnhancedStringTokenizer.java.diff?r1=1.3&r2=1.4
1.16 +10 -12 maven/src/java/org/apache/maven/util/Expand.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/Expand.java.diff?r1=1.15&r2=1.16
1.31 +69 -54 maven/src/java/org/apache/maven/util/HttpUtils.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/HttpUtils.java.diff?r1=1.30&r2=1.31
1.13 +3 -3 maven/src/java/org/apache/maven/util/MD5Sum.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/MD5Sum.java.diff?r1=1.12&r2=1.13
1.3 +1 -1 maven/src/java/org/apache/maven/util/MavenTool.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/MavenTool.java.diff?r1=1.2&r2=1.3
1.3 +10 -8 maven/src/java/org/apache/maven/util/ResourceBean.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/ResourceBean.java.diff?r1=1.2&r2=1.3
1.6 +6 -6 maven/src/java/org/apache/maven/util/StringTool.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/StringTool.java.diff?r1=1.5&r2=1.6
1.2 +388 -0 maven/src/java/org/apache/maven/util/Base64.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/util/Base64.java.diff?r1=1.1&r2=1.2
1.5 +2 -2
maven/src/java/org/apache/maven/verifier/ChecksumVerificationException.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/verifier/ChecksumVerificationException.java.diff?r1=1.4&r2=1.5
1.37 +1 -6 maven/src/java/org/apache/maven/verifier/DependencyVerifier.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/verifier/DependencyVerifier.java.diff?r1=1.36&r2=1.37
1.9 +3 -3
maven/src/java/org/apache/maven/verifier/LocalSettingsVerifier.java
http://cvs.apache.org/viewcvs/maven/src/java/org/apache/maven/verifier/LocalSettingsVerifier.java.diff?r1=1.8&r2=1.9
1.9 +2 -1
maven/src/test/java/org/apache/maven/plugin/PluginCacheManagerTest.java
http://cvs.apache.org/viewcvs/maven/src/test/java/org/apache/maven/plugin/PluginCacheManagerTest.java.diff?r1=1.8&r2=1.9
1.3 +10 -10 maven/src/test/java/org/apache/maven/plugin/forehead.conf
http://cvs.apache.org/viewcvs/maven/src/test/java/org/apache/maven/plugin/forehead.conf.diff?r1=1.2&r2=1.3
1.3 +14 -14
maven/src/test/java/org/apache/maven/plugin/maven.home/plugins/jar/META-INF/MANIFEST.MF
http://cvs.apache.org/viewcvs/maven/src/test/java/org/apache/maven/plugin/maven.home/plugins/jar/META-INF/MANIFEST.MF.diff?r1=1.2&r2=1.3
1.46 +43 -16 maven/src/test/touchstone-build/maven.xml
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/maven.xml.diff?r1=1.45&r2=1.46
1.37 +1 -12 maven/src/test/touchstone-build/project.xml
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/project.xml.diff?r1=1.36&r2=1.37
1.3 +1 -1
maven/src/test/touchstone-build/src/reactor-build/default/maven.xml
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/src/reactor-build/default/maven.xml.diff?r1=1.2&r2=1.3
1.2 +1 -0
maven/src/test/touchstone-build/src/reactor-build/default/project.properties
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/src/reactor-build/default/project.properties.diff?r1=1.1&r2=1.2
1.4 +15 -8
maven/src/test/touchstone-build/src/reactor-build/inheritence/maven.xml
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/src/reactor-build/inheritence/maven.xml.diff?r1=1.3&r2=1.4
1.4 +40 -28
maven/src/test/touchstone-build/src/reactor-build/inheritence/subproject/maven.xml
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/src/reactor-build/inheritence/subproject/maven.xml.diff?r1=1.3&r2=1.4
1.4 +52 -38
maven/src/test/touchstone-build/src/reactor-build/inheritence/subproject/subproject2/maven.xml
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/src/reactor-build/inheritence/subproject/subproject2/maven.xml.diff?r1=1.3&r2=1.4
1.2 +5 -5
maven/src/test/touchstone-build/src/reactor-build/resources/NOTES.txt
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/src/reactor-build/resources/NOTES.txt.diff?r1=1.1&r2=1.2
1.2 +1 -1
maven/src/test/touchstone-build/src/reactor-build/run_twice/NOTES.txt
http://cvs.apache.org/viewcvs/maven/src/test/touchstone-build/src/reactor-build/run_twice/NOTES.txt.diff?r1=1.1&r2=1.2
1.22 +23 -0 maven/xdocs/changes.xml
http://cvs.apache.org/viewcvs/maven/xdocs/changes.xml.diff?r1=1.21&r2=1.22
1.9 +1 -1 maven/xdocs/development-process.xml
http://cvs.apache.org/viewcvs/maven/xdocs/development-process.xml.diff?r1=1.8&r2=1.9
1.40 +2 -0 maven/xdocs/navigation.xml
http://cvs.apache.org/viewcvs/maven/xdocs/navigation.xml.diff?r1=1.39&r2=1.40
1.10 +1 -1 maven/xdocs/repository-upload.xml
http://cvs.apache.org/viewcvs/maven/xdocs/repository-upload.xml.diff?r1=1.9&r2=1.10
1.18 +8 -1 maven/xdocs/status.xml
http://cvs.apache.org/viewcvs/maven/xdocs/status.xml.diff?r1=1.17&r2=1.18
1.1 maven/xdocs/cvs-status.xml
http://cvs.apache.org/viewcvs/maven/xdocs/cvs-status.xml?rev=1.1
1.8 +10 -0 maven/xdocs/misc/articles.xml
http://cvs.apache.org/viewcvs/maven/xdocs/misc/articles.xml.diff?r1=1.7&r2=1.8
1.11 +1 -18 maven/xdocs/reference/dirlayout.xml
http://cvs.apache.org/viewcvs/maven/xdocs/reference/dirlayout.xml.diff?r1=1.10&r2=1.11
1.33 +276 -84 maven/xdocs/reference/project-descriptor.xml
http://cvs.apache.org/viewcvs/maven/xdocs/reference/project-descriptor.xml.diff?r1=1.32&r2=1.33
1.67 +1 -1 maven/xdocs/reference/user-guide.xml
http://cvs.apache.org/viewcvs/maven/xdocs/reference/user-guide.xml.diff?r1=1.66&r2=1.67
1.16 +5 -0 maven/xdocs/start/bootstrap.xml
http://cvs.apache.org/viewcvs/maven/xdocs/start/bootstrap.xml.diff?r1=1.15&r2=1.16
1.22 +10 -10 maven/xdocs/start/download.xml
http://cvs.apache.org/viewcvs/maven/xdocs/start/download.xml.diff?r1=1.21&r2=1.22
1.17 +23 -7 maven/xdocs/start/install.xml
http://cvs.apache.org/viewcvs/maven/xdocs/start/install.xml.diff?r1=1.16&r2=1.17
1.2 +106 -0 maven/xdocs/start/release-notes.xml
http://cvs.apache.org/viewcvs/maven/xdocs/start/release-notes.xml.diff?r1=1.1&r2=1.2
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]