diff --git a/build.xml b/build.xml index f86a929558..d63f47f41b 100644 --- a/build.xml +++ b/build.xml @@ -34,6 +34,8 @@ TODO: --> + + @@ -196,7 +198,58 @@ TODO: + + + + + + + + + + + + + + Retrieving integration tests + + + + + + + Running integration tests + + + + + + + + + + + Retrieving integration tests + + + + + Running integration tests + + + + + + + + + + Integration-test results should be displayed above. + + + + diff --git a/maven-integration-tests/pom.xml b/maven-integration-tests/pom.xml new file mode 100644 index 0000000000..0ded6959b0 --- /dev/null +++ b/maven-integration-tests/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + maven + org.apache.maven + 3.0-SNAPSHOT + + maven-integration-tests + Maven Integration-Test Importer + + + trunk + ${pom.basedir}/tests + + + + + update + + true + + + /tmp/maven-integration-tests-3.0.x/pom.xml + + + + + + maven-scm-plugin + + + scm + initialize + + update + + + + + + + + + checkout + + + + /tmp/maven-integration-tests-3.0.x/pom.xml + + + + + + maven-scm-plugin + + + scm + initialize + + checkout + + + + + + + + + + + + + maven-scm-plugin + 1.1 + + scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/${integrationTestSVNDir} + + + /tmp/maven-integration-tests-3.0.x + + + + + diff --git a/pom.xml b/pom.xml index 103ef69e30..d8067b3511 100644 --- a/pom.xml +++ b/pom.xml @@ -1,20 +1,22 @@ - - +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you 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. +--> + 4.0.0 org.apache.maven maven-parent @@ -565,4 +567,4 @@ - + \ No newline at end of file