Repository: maven-archetype Updated Branches: refs/heads/master 760000a9a -> 985465e59
fix build with Java 9: need to define compiler target to value > 5 Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/985465e5 Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/985465e5 Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/985465e5 Branch: refs/heads/master Commit: 985465e59fe2dde7fab84be020866a2d74cc9277 Parents: 760000a Author: Hervé Boutemy <hbout...@apache.org> Authored: Sun Jan 21 14:27:33 2018 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sun Jan 21 14:27:33 2018 +0100 ---------------------------------------------------------------------- .../pom.xml | 4 ++++ .../main/resources/archetype-resources/pom.xml | 18 ++++++++++++++++++ .../resources/projects/basic/reference/pom.xml | 18 ++++++++++++++++++ .../build-archetype-ignore-eol-encoding/pom.xml | 8 ++++++++ .../main/resources/archetype-resources/pom.xml | 18 ++++++++++++++++++ .../resources/projects/basic/reference/pom.xml | 18 ++++++++++++++++++ .../src/it/projects/build-archetype/pom.xml | 4 ++++ .../main/resources/archetype-resources/pom.xml | 18 ++++++++++++++++++ .../resources/projects/basic/reference/pom.xml | 18 ++++++++++++++++++ 9 files changed, 124 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/pom.xml index ecc4f16..d9ef111 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/pom.xml @@ -31,6 +31,10 @@ under the License. <name>build-archetype-with-existing-parent</name> <description>packages an archetype then runs IT (archetype:integration-test) within a Maven Project being created through another archetype</description> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> <extensions> <extension> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/pom.xml index 7ba4cfb..aa77176 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/main/resources/archetype-resources/pom.xml @@ -29,4 +29,22 @@ under the License. <version>${version}</version> <name>archetype build IT</name> + + <properties> + <javaVersion>6</javaVersion> + <maven.compiler.source>1.${javaVersion}</maven.compiler.source> + <maven.compiler.target>1.${javaVersion}</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + </plugin> + </plugins> + </pluginManagement> + </build> </project> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/pom.xml index 62a4b5b..1039f6a 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype-and-run-its-with-existing-parent/src/test/resources/projects/basic/reference/pom.xml @@ -29,4 +29,22 @@ under the License. <version>0.1-SNAPSHOT</version> <name>archetype build IT</name> + + <properties> + <javaVersion>6</javaVersion> + <maven.compiler.source>1.${javaVersion}</maven.compiler.source> + <maven.compiler.target>1.${javaVersion}</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + </plugin> + </plugins> + </pluginManagement> + </build> </project> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/pom.xml index d0970af..833ee27 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/pom.xml @@ -31,6 +31,10 @@ under the License. <name>build-archetype</name> <description>packages an archetype then runs IT (archetype:integration-test)</description> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> <extensions> <extension> @@ -43,6 +47,10 @@ under the License. <pluginManagement> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + </plugin> + <plugin> <artifactId>maven-archetype-plugin</artifactId> <version>@project.version@</version> <configuration> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/pom.xml index 6c23175..d370f2d 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/main/resources/archetype-resources/pom.xml @@ -28,4 +28,22 @@ under the License. <version>${version}</version> <name>archetype build IT</name> + + <properties> + <javaVersion>6</javaVersion> + <maven.compiler.source>1.${javaVersion}</maven.compiler.source> + <maven.compiler.target>1.${javaVersion}</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + </plugin> + </plugins> + </pluginManagement> + </build> </project> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/pom.xml index ed5ad61..42e28ce 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype-ignore-eol-encoding/src/test/resources/projects/basic/reference/pom.xml @@ -28,4 +28,22 @@ under the License. <version>0.1-SNAPSHOT</version> <name>archetype build IT</name> + + <properties> + <javaVersion>6</javaVersion> + <maven.compiler.source>1.${javaVersion}</maven.compiler.source> + <maven.compiler.target>1.${javaVersion}</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + </plugin> + </plugins> + </pluginManagement> + </build> </project> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml index b24c297..31b8dad 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml @@ -31,6 +31,10 @@ under the License. <name>build-archetype</name> <description>packages an archetype then runs IT (archetype:integration-test)</description> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> <extensions> <extension> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype/src/main/resources/archetype-resources/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype/src/main/resources/archetype-resources/pom.xml index 6c23175..d370f2d 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype/src/main/resources/archetype-resources/pom.xml @@ -28,4 +28,22 @@ under the License. <version>${version}</version> <name>archetype build IT</name> + + <properties> + <javaVersion>6</javaVersion> + <maven.compiler.source>1.${javaVersion}</maven.compiler.source> + <maven.compiler.target>1.${javaVersion}</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + </plugin> + </plugins> + </pluginManagement> + </build> </project> http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/985465e5/maven-archetype-plugin/src/it/projects/build-archetype/src/test/resources/projects/basic/reference/pom.xml ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/it/projects/build-archetype/src/test/resources/projects/basic/reference/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype/src/test/resources/projects/basic/reference/pom.xml index ed5ad61..42e28ce 100644 --- a/maven-archetype-plugin/src/it/projects/build-archetype/src/test/resources/projects/basic/reference/pom.xml +++ b/maven-archetype-plugin/src/it/projects/build-archetype/src/test/resources/projects/basic/reference/pom.xml @@ -28,4 +28,22 @@ under the License. <version>0.1-SNAPSHOT</version> <name>archetype build IT</name> + + <properties> + <javaVersion>6</javaVersion> + <maven.compiler.source>1.${javaVersion}</maven.compiler.source> + <maven.compiler.target>1.${javaVersion}</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + </plugin> + </plugins> + </pluginManagement> + </build> </project>
