java8 profile separated to java8 & java8-examples. Fixed examples standalone poms.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ead970c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ead970c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ead970c8 Branch: refs/heads/ignite-release-test-no-mod Commit: ead970c847e848db3d955902d3ec776488af7598 Parents: 444ee28 Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Mar 23 12:12:42 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Mar 23 12:12:42 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 20 ++++++++++++++++++-- examples/pom.xml | 2 +- pom.xml | 40 ++++++++++++++++++++-------------------- 3 files changed, 39 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ead970c8/examples/pom-standalone.xml ---------------------------------------------------------------------- diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml index 573961a..9cd0a24 100644 --- a/examples/pom-standalone.xml +++ b/examples/pom-standalone.xml @@ -118,7 +118,7 @@ <profiles> <profile> - <id>java8</id> + <id>java8-examples</id> <activation> <jdk>[1.8,)</jdk> @@ -141,11 +141,27 @@ <version>1.9.1</version> <executions> <execution> + <id>add-sources</id> <phase>generate-sources</phase> - <goals><goal>add-source</goal></goals> + <goals> + <goal>add-source</goal> + </goals> <configuration> <sources> <source>src/main/java8</source> + <source>schema-import/src/main/java</source> + </sources> + </configuration> + </execution> + <execution> + <id>add-tests</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>src/test/java8</source> </sources> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ead970c8/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index b2df50e..b64680b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -248,7 +248,7 @@ </profile> <profile> - <id>java8</id> + <id>java8-examples</id> <activation> <jdk>[1.8,)</jdk> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ead970c8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b788f2e..e2bb9f2 100644 --- a/pom.xml +++ b/pom.xml @@ -1363,25 +1363,25 @@ </build> </profile> - <!--<profile>--> - <!--<id>java8</id>--> - <!--<activation>--> - <!--<jdk>[1.8,)</jdk>--> - <!--</activation>--> - <!--<properties>--> - <!--<javadoc.opts>-Xdoclint:none</javadoc.opts>--> - <!--</properties>--> - <!--<build>--> - <!--<plugins>--> - <!--<plugin>--> - <!--<artifactId>maven-compiler-plugin</artifactId>--> - <!--<configuration>--> - <!--<source>1.8</source>--> - <!--<target>1.8</target>--> - <!--</configuration>--> - <!--</plugin>--> - <!--</plugins>--> - <!--</build>--> - <!--</profile>--> + <profile> + <id>java8</id> + <activation> + <jdk>[1.8,)</jdk> + </activation> + <properties> + <javadoc.opts>-Xdoclint:none</javadoc.opts> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>
