- Hardcode requirement for java 1.8 or newer to build

OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=39

mysql-connector-java.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 18 12:40:03 UTC 2017 - tchvatal@suse.com
+
+- Hardcode requirement for java 1.8 or newer to build
+
 -------------------------------------------------------------------
 Thu May 18 11:55:03 UTC 2017 - tchvatal@suse.com
 

mysql-connector-java.spec

@@ -36,7 +36,7 @@ BuildRequires:  ant
 BuildRequires:  ant-contrib
 BuildRequires:  apache-commons-logging
 BuildRequires:  geronimo-jta-1_1-api
-BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  java-devel >= 1.8.0
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
 BuildRequires:  log4j-mini
@@ -101,19 +101,19 @@ export CLASSPATH=$(build-classpath \
     junit \
     log4j)
 ant \
-    -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-    -DbuildDir=build-mysql-jdbc \
-    -DdistDir=dist-mysql-jdbc \
+    -Dcom.mysql.jdbc.jdk5.javac=%{javac} \
+    -Dcom.mysql.jdbc.jdk8.javac=%{javac} \
+    -Dsnapshot.version= \
     -Dcom.mysql.jdbc.extra.libs=lib \
-    -Dcom.mysql.jdbc.jdk5.javac="%{javac}" \
-    -Dcom.mysql.jdbc.jdk8.javac="%{javac}" \
-    -Dcom.mysql.jdbc.jdk8.java="%{java}" \
+    -Dant.java.version=1.5 \
+    -Dant.build.javac.source=1.6 \
+    -Dant.build.javac.target=1.7 \
     dist
 
 %install
 install -d -m 755 %{buildroot}%{_javadir}
 
-install ./build-mysql-jdbc/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT-bin.jar \
+install ./build/%{name}-%{version}/%{name}-%{version}-bin.jar \
         %{buildroot}%{_javadir}/%{name}.jar
 
 rm -rf %{buildroot}%{name}-%{version}/docs/release-test-output