SLIDER-643 revert to 2.6.0-SNAPSHOT profile for jenkins. Develop/ patch stays on 2.6, but adds release-2.6 and branch-2.6 profiles
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/26bb9d74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/26bb9d74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/26bb9d74 Branch: refs/heads/develop Commit: 26bb9d743c4e88f15a15f357e229b7a9cd06d6e9 Parents: a0a9c51 Author: Steve Loughran <[email protected]> Authored: Wed Nov 12 15:39:09 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Nov 12 15:39:09 2014 +0000 ---------------------------------------------------------------------- pom.xml | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/26bb9d74/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7aa59ff..1e61340 100644 --- a/pom.xml +++ b/pom.xml @@ -1405,12 +1405,18 @@ </profile> <profile> - <!-- local builds of everything --> - <id>local</id> + <!-- 2.6 snapshots --> + <id>branch-2.6</id> <properties> <hadoop.version>2.6.0-SNAPSHOT</hadoop.version> - <hbase.version>0.98.5-SNAPSHOT</hbase.version> - <accumulo.version>1.6.0-SNAPSHOT</accumulo.version> + </properties> + </profile> + + <profile> + <!-- 2.6 snapshots --> + <id>release-2.6</id> + <properties> + <hadoop.version>2.6.0</hadoop.version> </properties> </profile> @@ -1424,13 +1430,29 @@ <profile> <!-- hadoop trunk builds --> - <id>hadoop-trunk</id> + <id>trunk</id> <properties> <hadoop.version>3.0.0-SNAPSHOT</hadoop.version> </properties> </profile> <profile> + <!-- Java 7 build --> + <id>java7</id> + <properties> + <project.java.src.version>7</project.java.src.version> + </properties> + </profile> + + <profile> + <!-- Java 8 build --> + <id>java8</id> + <properties> + <project.java.src.version>8</project.java.src.version> + </properties> + </profile> + + <profile> <!-- anything for a jenkins build --> <id>jenkins</id> <properties>
