upgraded parent pom to benefit from site staging configuration

This commit is contained in:
Hervé Boutemy 2017-03-25 11:26:23 +01:00
parent 762669982b
commit 727cf7f339
2 changed files with 47 additions and 29 deletions

View File

@ -1,15 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor <!--
license agreements. See the NOTICE file distributed with this work for additional Licensed to the Apache Software Foundation (ASF) under one
information regarding copyright ownership. The ASF licenses this file to or more contributor license agreements. See the NOTICE file
you under the Apache License, Version 2.0 (the "License"); you may not use distributed with this work for additional information
this file except in compliance with the License. You may obtain a copy of regarding copyright ownership. The ASF licenses this file
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required to you under the Apache License, Version 2.0 (the
by applicable law or agreed to in writing, software distributed under the "License"); you may not use this file except in compliance
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS with the License. You may obtain a copy of the License at
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. --> 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@ -26,24 +34,34 @@
<name>Maven ITs</name> <name>Maven ITs</name>
<description>The effective Maven Integration Tests suite.</description> <description>The effective Maven Integration Tests suite.</description>
<!-- By default, the project just packages the tests in an artifact. To <!--
actually run them, activate the profile "run-its": mvn clean test -Prun-its By default, the project just packages the tests in an artifact. To actually run them, activate the profile "run-its":
This will subject the Maven version running the build to the integration
tests. If you would like to test a different Maven distribution, you can mvn clean test -Prun-its
use the system property "mavenHome" to specify the path of the Maven distribution
to test: mvn clean test -Prun-its -DmavenHome=<maven-under-test> Alternatively, This will subject the Maven version running the build to the integration tests. If you would like to test a different
you can just specify the version of a previously installed/deployed Maven Maven distribution, you can use the system property "mavenHome" to specify the path of the Maven distribution to test:
distribution which will be downloaded, unpacked and tested: mvn clean test
-Prun-its -DmavenVersion=2.2.1 It's also possible to point the ITs at an mvn clean test -Prun-its -DmavenHome=<maven-under-test>
already downloaded Maven distribution: mvn clean test -Prun-its -DmavenDistro=<path-to-bin-archive>
To run the ITs using embedded Maven 3.x, additionally activate the profile Alternatively, you can just specify the version of a previously installed/deployed Maven distribution which will be
"embedded". ITs that don't require to fork Maven can also be run from the downloaded, unpacked and tested:
IDE using the Maven projects from the workspace if the Maven dependencies
are added to the test class path. If you're behind a proxy, use the system mvn clean test -Prun-its -DmavenVersion=2.2.1
properties proxy.host, proxy.port, proxy.user and proxy.pass to specify the
required proxy setup for the ITs. Alternatively, set the system property It's also possible to point the ITs at an already downloaded Maven distribution:
maven.it.central to a URL of a local repository manager that proxies the
required artifacts. --> mvn clean test -Prun-its -DmavenDistro=<path-to-bin-archive>
To run the ITs using embedded Maven 3.x, additionally activate the profile "embedded".
ITs that don't require to fork Maven can also be run from the IDE using the Maven projects from the workspace if the
Maven dependencies are added to the test class path.
If you're behind a proxy, use the system properties proxy.host, proxy.port, proxy.user and proxy.pass to specify the
required proxy setup for the ITs. Alternatively, set the system property maven.it.central to a URL of a local
repository manager that proxies the required artifacts.
-->
<properties> <properties>
<surefireMemory>-Xmx384m</surefireMemory> <surefireMemory>-Xmx384m</surefireMemory>

View File

@ -25,7 +25,7 @@ under the License.
<parent> <parent>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId> <artifactId>maven-parent</artifactId>
<version>26</version> <version>27</version>
<relativePath>../pom/maven/pom.xml</relativePath> <relativePath>../pom/maven/pom.xml</relativePath>
</parent> </parent>