Alon Bar-Lev has uploaded a new change for review. Change subject: build: force java-1.7 source and target ......................................................................
build: force java-1.7 source and target soon java-8 will be used to build, we should force our preferences. Change-Id: Id5f3e70f51279102ae1b079fecd812b064ef54cb Signed-off-by: Alon Bar-Lev <[email protected]> --- M ovirt-engine-dwh.spec.in M ovirt-engine-dwh/advancedPersistentLookupLib/build.xml M ovirt-engine-dwh/etltermination/build.xml M ovirt-engine-dwh/historyETL/build.xml M ovirt-engine-dwh/routines/build.xml 5 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/59/34459/1 diff --git a/ovirt-engine-dwh.spec.in b/ovirt-engine-dwh.spec.in index 4ff179d..9b28e2b 100644 --- a/ovirt-engine-dwh.spec.in +++ b/ovirt-engine-dwh.spec.in @@ -89,7 +89,6 @@ BuildRequires: %{commons_collections} BuildRequires: %{dom4j} BuildRequires: ant -BuildRequires: java-1.7.0-openjdk-devel BuildRequires: jpackage-utils BuildRequires: make @@ -97,10 +96,15 @@ BuildRequires: systemd %endif +%if 0%{?rhel} +BuildRequires: java7-devel +%endif +%if 0%{?fedora} +BuildRequires: java-devel >= 1.7.0 +%endif Requires: %{commons_collections} Requires: %{dom4j} Requires: %{name}-setup >= %{version}-%{release} -Requires: java-1.7.0-openjdk Requires: jpackage-utils Requires: logrotate Requires: postgresql-jdbc diff --git a/ovirt-engine-dwh/advancedPersistentLookupLib/build.xml b/ovirt-engine-dwh/advancedPersistentLookupLib/build.xml index 36354d7..cb4cc5e 100644 --- a/ovirt-engine-dwh/advancedPersistentLookupLib/build.xml +++ b/ovirt-engine-dwh/advancedPersistentLookupLib/build.xml @@ -20,6 +20,8 @@ debug="true" debuglevel="lines,vars,source" classpathref="local.classpath" + source="1.7" + target="1.7" /> <jar destfile="${local.output}" diff --git a/ovirt-engine-dwh/etltermination/build.xml b/ovirt-engine-dwh/etltermination/build.xml index 6550857..f879ca6 100644 --- a/ovirt-engine-dwh/etltermination/build.xml +++ b/ovirt-engine-dwh/etltermination/build.xml @@ -18,6 +18,8 @@ debug="true" debuglevel="lines,vars,source" classpathref="local.classpath" + source="1.7" + target="1.7" /> <jar destfile="${local.output}" diff --git a/ovirt-engine-dwh/historyETL/build.xml b/ovirt-engine-dwh/historyETL/build.xml index 05b53d9..3d2fd70 100644 --- a/ovirt-engine-dwh/historyETL/build.xml +++ b/ovirt-engine-dwh/historyETL/build.xml @@ -20,6 +20,8 @@ debug="true" debuglevel="lines,vars,source" classpathref="local.classpath" + source="1.7" + target="1.7" /> <jar destfile="${local.output}"> <fileset dir="target"/> diff --git a/ovirt-engine-dwh/routines/build.xml b/ovirt-engine-dwh/routines/build.xml index 47568de..9b8ef78 100644 --- a/ovirt-engine-dwh/routines/build.xml +++ b/ovirt-engine-dwh/routines/build.xml @@ -19,6 +19,8 @@ debug="true" debuglevel="lines,vars,source" classpathref="local.classpath" + source="1.7" + target="1.7" /> <jar destfile="${local.output}" -- To view, visit http://gerrit.ovirt.org/34459 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5f3e70f51279102ae1b079fecd812b064ef54cb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
