From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 23 Oct 2013 15:21:54 +0000 (+0300)
Subject: can not build for older source level:
X-Git-Tag: auto/th/tomcat-native-1.1.30-1~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftomcat-native.git;a=commitdiff_plain;h=5f1f37b

can not build for older source level:

compile:
jni/dist/src/java/org/apache/tomcat/jni/socket/AprSocketContext.java:111: error: diamond operator is not supported in -source 1.6
    private final List<AprPoller> pollers = new ArrayList<>();
                                                          ^
jni/dist/src/java/org/apache/tomcat/jni/socket/AprSocketContext.java:795: error: try-with-resources is not supported in -source 1.6
              try (java.net.Socket sock = new java.net.Socket()) {
---

diff --git a/tomcat-native.spec b/tomcat-native.spec
index 22deeab..f1dab81 100644
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -86,7 +86,10 @@ Statyczna biblioteka tcnative.
 %build
 # build java part
 cd jni
-%ant clean jar
+%ant clean jar \
+	-Dcompile.source=1.7 \
+	-Dcompile.target=1.7 \
+	%{nil}
 
 # build native part
 cd native