From 4c994b2b5aa7b98293b678fc13760697cfb81a62 Mon Sep 17 00:00:00 2001 From: aheritier Date: Wed, 14 Sep 2005 14:06:20 +0000 Subject: [PATCH] Replace the multiproject:goal by the reactor (workaround for MAVEN-1691). Fix all tests in all plugins. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@280860 13f79535-47bb-0310-9956-ffa450edef68 --- abbot/src/plugin-test/maven.xml | 5 ++-- abbot/src/plugin-test/project.properties | 25 ------------------- clover/src/plugin-test/maven.xml | 5 ++-- clover/src/plugin-test/project.properties | 16 ------------ cruisecontrol/src/plugin-test/maven.xml | 8 ++---- .../src/plugin-test/project.properties | 23 ----------------- dashboard/src/plugin-test/maven.xml | 4 +-- dashboard/src/plugin-test/project.properties | 2 +- eclipse/src/plugin-test/maven.xml | 8 ++---- eclipse/src/plugin-test/project.properties | 23 ----------------- maven.xml | 13 +++------- 11 files changed, 15 insertions(+), 117 deletions(-) delete mode 100644 abbot/src/plugin-test/project.properties delete mode 100644 clover/src/plugin-test/project.properties delete mode 100644 cruisecontrol/src/plugin-test/project.properties delete mode 100644 eclipse/src/plugin-test/project.properties diff --git a/abbot/src/plugin-test/maven.xml b/abbot/src/plugin-test/maven.xml index f2af6129..a3b2765c 100644 --- a/abbot/src/plugin-test/maven.xml +++ b/abbot/src/plugin-test/maven.xml @@ -1,6 +1,6 @@ - + This plugin must be tested manually (with the testPlugin-manual goal) as it requires defining a build.properties containing environment-dependent configuration. @@ -13,8 +13,7 @@ environment variable must be set. --> - - + diff --git a/abbot/src/plugin-test/project.properties b/abbot/src/plugin-test/project.properties deleted file mode 100644 index 370b1f24..00000000 --- a/abbot/src/plugin-test/project.properties +++ /dev/null @@ -1,25 +0,0 @@ -# ------------------------------------------------------------------- -# Copyright 2001-2004 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. -# ------------------------------------------------------------------- - -# ------------------------------------------------------------------- -# P R O J E C T P R O P E R T I E S -# ------------------------------------------------------------------- - -# 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= diff --git a/clover/src/plugin-test/maven.xml b/clover/src/plugin-test/maven.xml index f2683869..1e4d6bd0 100644 --- a/clover/src/plugin-test/maven.xml +++ b/clover/src/plugin-test/maven.xml @@ -15,11 +15,10 @@ * limitations under the License. */ --> - + - - + \ No newline at end of file diff --git a/clover/src/plugin-test/project.properties b/clover/src/plugin-test/project.properties deleted file mode 100644 index 4e72a351..00000000 --- a/clover/src/plugin-test/project.properties +++ /dev/null @@ -1,16 +0,0 @@ -# ------------------------------------------------------------------- -# Copyright 2005 The Apache Software Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ------------------------------------------------------------------- - diff --git a/cruisecontrol/src/plugin-test/maven.xml b/cruisecontrol/src/plugin-test/maven.xml index 2c947cb2..7b9a8bad 100644 --- a/cruisecontrol/src/plugin-test/maven.xml +++ b/cruisecontrol/src/plugin-test/maven.xml @@ -15,14 +15,10 @@ * limitations under the License. */ --> - + - - - - - + \ No newline at end of file diff --git a/cruisecontrol/src/plugin-test/project.properties b/cruisecontrol/src/plugin-test/project.properties deleted file mode 100644 index 22d6db28..00000000 --- a/cruisecontrol/src/plugin-test/project.properties +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------- -# Copyright 2001-2004 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= - - diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml index a10f1238..839edb47 100644 --- a/dashboard/src/plugin-test/maven.xml +++ b/dashboard/src/plugin-test/maven.xml @@ -20,6 +20,7 @@ xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:x="jelly:xml" + xmlns:maven="jelly:maven" xmlns:assert="assert"> @@ -30,8 +31,7 @@ - - + diff --git a/dashboard/src/plugin-test/project.properties b/dashboard/src/plugin-test/project.properties index d828e5d6..e14d92bf 100644 --- a/dashboard/src/plugin-test/project.properties +++ b/dashboard/src/plugin-test/project.properties @@ -18,5 +18,5 @@ maven.multiproject.basedir = ${basedir} maven.multiproject.includes = */project.xml maven.multiproject.excludes = common/project.xml - +maven.multiproject.navigation = aggregate maven.multiproject.site.goals = site,dashboard:report-single diff --git a/eclipse/src/plugin-test/maven.xml b/eclipse/src/plugin-test/maven.xml index 2c947cb2..7b9a8bad 100644 --- a/eclipse/src/plugin-test/maven.xml +++ b/eclipse/src/plugin-test/maven.xml @@ -15,14 +15,10 @@ * limitations under the License. */ --> - + - - - - - + \ No newline at end of file diff --git a/eclipse/src/plugin-test/project.properties b/eclipse/src/plugin-test/project.properties deleted file mode 100644 index 22d6db28..00000000 --- a/eclipse/src/plugin-test/project.properties +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------- -# Copyright 2001-2004 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= - - diff --git a/maven.xml b/maven.xml index 3e189b15..b7598851 100644 --- a/maven.xml +++ b/maven.xml @@ -15,20 +15,15 @@ * limitations under the License. */ --> - + - - + - - + - - - - +