Alon Bar-Lev has uploaded a new change for review.
Change subject: build: force java-1.5 source and target
......................................................................
build: force java-1.5 source and target
soon java-8 will be used to build, we should force our preferences.
Change-Id: Ic5efc391c5142663eea99b98dd864326ec8586b8
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M src/java/Makefile.am
M src/java/pom.xml.in
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/otopi refs/changes/68/34468/1
diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index c4f0fe1..e1676ee 100644
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -80,7 +80,7 @@
rm -f "$(targetjar)"
$(MKDIR_P) "$(targetdir)"
$(MKDIR_P) target
- $(JAVAC) -cp $(COMMONS_LOGGING_JAR):$(JUNIT_JAR) -d target `find src
-name '*.java'`
+ $(JAVAC) -source 1.5 -target 1.5 -cp
$(COMMONS_LOGGING_JAR):$(JUNIT_JAR) -d target `find src -name '*.java'`
$(JAR) -cmf $(srcdir)/MANIFEST.MF "$(targetjar)" -C target .
endif
diff --git a/src/java/pom.xml.in b/src/java/pom.xml.in
index 05d006a..26fb5c3 100644
--- a/src/java/pom.xml.in
+++ b/src/java/pom.xml.in
@@ -75,6 +75,15 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
--
To view, visit http://gerrit.ovirt.org/34468
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5efc391c5142663eea99b98dd864326ec8586b8
Gerrit-PatchSet: 1
Gerrit-Project: otopi
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
