Author: ltheussl Date: Wed Jul 26 13:56:27 2006 New Revision: 425838 URL: http://svn.apache.org/viewvc?rev=425838&view=rev Log: Roll back r280860: MAVEN-1691 is fixed.
Added: maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.properties (with props) Modified: maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml Modified: maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml?rev=425838&r1=425837&r2=425838&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml (original) +++ maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml Wed Jul 26 13:56:27 2006 @@ -15,10 +15,12 @@ * limitations under the License. */ --> -<project xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:maven="jelly:maven"> +<project xmlns:util="jelly:util" xmlns:j="jelly:core"> <goal name="testPlugin"> - <maven:reactor basedir="${basedir}" includes="*/project.xml" goals="testPlugin" banner="Test" ignoreFailures="false"/> + <!-- Generate project artifacts --> + <j:set var="goal" value="testPlugin"/> + <attainGoal name="multiproject:goal"/> </goal> - + </project> Added: maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.properties URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.properties?rev=425838&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.properties (added) +++ maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.properties Wed Jul 26 13:56:27 2006 @@ -0,0 +1,21 @@ +# ------------------------------------------------------------------- +# Copyright 2006 The Apache Software Foundation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ------------------------------------------------------------------- + + +# MUST specify these, even though they are the defaults, so we can run inside reactor where they were already set +maven.multiproject.basedir=${basedir} +maven.multiproject.includes=*/project.xml +maven.multiproject.excludes= \ No newline at end of file Propchange: maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.properties ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision"