Repository: maven-integration-testing Updated Branches: refs/heads/master ee3cae93c -> 3fed9eb66
Expand test with java7 diamonds Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/3fed9eb6 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/3fed9eb6 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/3fed9eb6 Branch: refs/heads/master Commit: 3fed9eb6668d752175ce0025424e44352003d593 Parents: ee3cae9 Author: Robert Scholte <[email protected]> Authored: Sat Sep 19 22:16:17 2015 +0200 Committer: Robert Scholte <[email protected]> Committed: Sat Sep 19 22:16:17 2015 +0200 ---------------------------------------------------------------------- .../src/test/resources/mng-3203/pom.xml | 33 ++++++++++++++++++++ .../org/apache/maven/it/mng3203/Diamond.java | 16 ++++++++++ 2 files changed, 49 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3fed9eb6/core-it-suite/src/test/resources/mng-3203/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3203/pom.xml b/core-it-suite/src/test/resources/mng-3203/pom.xml index 5fbad12..e3fdea5 100644 --- a/core-it-suite/src/test/resources/mng-3203/pom.xml +++ b/core-it-suite/src/test/resources/mng-3203/pom.xml @@ -17,6 +17,9 @@ <configuration> <source>1.5</source> <target>1.5</target> + <includes> + <include>**/App.java</include> + </includes> </configuration> </execution> </executions> @@ -24,4 +27,34 @@ </plugins> </pluginManagement> </build> + + <profiles> + <profile> + <id>diamond-generics</id> + <activation> + <jdk>[1.7,)</jdk> + </activation> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>default-compile</id> + <configuration> + <source>1.7</source> + <target>1.7</target> + <includes> + <include>**/Diamond.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3fed9eb6/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/Diamond.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/Diamond.java b/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/Diamond.java new file mode 100644 index 0000000..4c2a75a --- /dev/null +++ b/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/Diamond.java @@ -0,0 +1,16 @@ +package org.apache.maven.it.mng3203; + +import java.util.List; +import java.util.ArrayList; + +/** + * Hello world! + * + */ +public class Diamond +{ + public static void main( String[] args ) + { + List<String> stuff = new ArrayList<>(); + } +}
