You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/05/01 11:29:04 UTC
svn commit: r1741849 - in
/maven/resources/trunk/apache-source-release-assembly-descriptor: ./
src/test/resources/basics/ src/test/resources/build-output-dir/
src/test/resources/ide-excludes/ src/test/resources/misc-excludes/
src/test/resources/output-...
Author: hboutemy
Date: Sun May 1 09:29:04 2016
New Revision: 1741849
URL: http://svn.apache.org/viewvc?rev=1741849&view=rev
Log:
refactoring: put assemblyPluginVersion as property for ITs and fixed warning in ITs about source encoding not set
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-ide-files/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml Sun May 1 09:29:04 2016
@@ -51,6 +51,8 @@ under the License.
<mavenHome>${maven.home}</mavenHome>
<!-- The (possibly instrumented copy of the) Maven distribution we actually use for the tests. -->
<preparedMavenHome>${mavenHome}</preparedMavenHome>
+ <!-- the version of aven-assemplugin to use in ITs -->
+ <assemblyPluginVersion>2.2</assemblyPluginVersion>
</properties>
<dependencies>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>basics</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>basics-child1</module>
<module>basics-child2</module>
@@ -34,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>build-output-dir</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>build-output-dir-child1</module>
<module>build-output-dir-child2</module>
@@ -34,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>ide-excludes</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>ide-excludes-child1</module>
<module>ide-excludes-child2</module>
@@ -34,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>misc-excludes</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>misc-excludes-child1</module>
<module>misc-excludes-child2</module>
@@ -34,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>misc-excludes</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>misc-excludes-child1</module>
<module>misc-excludes-child2</module>
@@ -34,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/output-dir-contains-src-name/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>output-dir-contains-src-name</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>output-dir-contains-src-name-child1</module>
<module>output-dir-contains-src-name-child2</module>
@@ -47,7 +54,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>shared-resources</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>shared-resources-child1</module>
<module>shared-resources-child2</module>
@@ -51,7 +58,7 @@ under the License.
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-ide-files/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-ide-files/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-ide-files/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-ide-files/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>src-contains-ide-files</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>src-contains-ide-files-child1</module>
</modules>
@@ -33,7 +40,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,19 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>src-contains-output-dir-name</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<modules>
<module>src-contains-output-dir-name-child1</module>
<module>src-contains-output-dir-name-child2</module>
@@ -34,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml?rev=1741849&r1=1741848&r2=1741849&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/zip-and-tar/pom.xml Sun May 1 09:29:04 2016
@@ -19,12 +19,15 @@ specific language governing permissions
under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.assembly.it</groupId>
<artifactId>zip-and-tar</artifactId>
<version>1</version>
<packaging>pom</packaging>
+
<modules>
<module>zip-and-tar-child1</module>
<module>zip-and-tar-child2</module>
@@ -38,7 +41,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
+ <version>@assemblyPluginVersion@</version>
<dependencies>
<dependency>