From 3b93728b1b51df2c7c3ba8621b5710946473967c5fc570329b69e604ba73e80e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2017 06:45:53 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=46 --- mysql-connector-java.changes | 6 ++++++ mysql-connector-java.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes index fe08aa0..26b32f1 100644 --- a/mysql-connector-java.changes +++ b/mysql-connector-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 29 06:45:22 UTC 2017 - fstrba@suse.com + +- Don't condition the maven defines on release version, but on + _maven_repository being defined + ------------------------------------------------------------------- Sun Sep 10 13:49:02 UTC 2017 - fstrba@suse.com diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 15a71d7..4a8b8c6 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -130,10 +130,10 @@ sed -i 's/>@.*%{version} 1320 -%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml* -%else +%if %{defined _maven_repository} %config(noreplace) %{_mavendepmapfragdir}/* +%else +%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml* %endif %{_mavenpomdir}/*.pom From 9e85268ed150685d5f9a6b6df9d9910381663c874362dea7f670f7b5a6e88b08 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 6 Oct 2017 08:15:22 +0000 Subject: [PATCH 2/3] Fix build with jdk9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=47 --- mysql-connector-java-sourcetarget.patch | 57 +++++++++++++++++++++++++ mysql-connector-java.changes | 9 ++++ mysql-connector-java.spec | 10 ++--- 3 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 mysql-connector-java-sourcetarget.patch diff --git a/mysql-connector-java-sourcetarget.patch b/mysql-connector-java-sourcetarget.patch new file mode 100644 index 0000000..df322e8 --- /dev/null +++ b/mysql-connector-java-sourcetarget.patch @@ -0,0 +1,57 @@ +--- mysql-connector-java-5.1.43/build.xml 2017-07-06 21:42:45.000000000 +0200 ++++ mysql-connector-java-5.1.43/build.xml 2017-10-06 10:08:59.178208898 +0200 +@@ -856,9 +856,7 @@ + fork="yes" + executable="${com.mysql.jdbc.jdk5.javac}" + compiler="modern" +- includeantruntime="false" +- source="1.5" +- target="1.5"> ++ includeantruntime="false"> + + + +@@ -930,9 +928,7 @@ + fork="yes" + executable="${com.mysql.jdbc.jdk5.javac}" + compiler="modern" +- includeantruntime="false" +- source="1.5" +- target="1.5"> ++ includeantruntime="false"> + + + +@@ -993,9 +989,7 @@ + fork="yes" + executable="${com.mysql.jdbc.jdk5.javac}" + compiler="modern" +- includeantruntime="false" +- source="1.5" +- target="1.5"> ++ includeantruntime="false"> + + + +@@ -1014,9 +1008,7 @@ + fork="yes" + executable="${com.mysql.jdbc.jdk5.javac}" + compiler="modern" +- includeantruntime="false" +- source="1.5" +- target="1.5"> ++ includeantruntime="false"> + + + +@@ -1035,9 +1027,7 @@ + fork="yes" + executable="${com.mysql.jdbc.jdk5.javac}" + compiler="modern" +- includeantruntime="false" +- source="1.5" +- target="1.5"> ++ includeantruntime="false"> + + + diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes index 26b32f1..d89647a 100644 --- a/mysql-connector-java.changes +++ b/mysql-connector-java.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Oct 6 08:13:05 UTC 2017 - fstrba@suse.com + +- Fix build with jdk9 +- Added patch: + * mysql-connector-java-sourcetarget.patch + + Don't hardcode java source and target levels; specify them + on command-line. + ------------------------------------------------------------------- Fri Sep 29 06:45:22 UTC 2017 - fstrba@suse.com diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 4a8b8c6..19516a5 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -32,11 +32,12 @@ Patch1: hibernate-check.patch Patch2: mysql-connector-java-jdbc-4.1.patch Patch3: disable-testsuite.patch Patch4: compile-jdk7.patch +Patch5: mysql-connector-java-sourcetarget.patch BuildRequires: ant BuildRequires: ant-contrib BuildRequires: apache-commons-logging BuildRequires: geronimo-jta-1_1-api -BuildRequires: java-devel = 1.8.0 +BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -51,7 +52,6 @@ Obsoletes: mm.mysql < %{version} # manual is no longer distributed Provides: %{name}-manual = %{version} Obsoletes: %{name}-manual < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -70,6 +70,7 @@ set that supports the capabilities of MySQL. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # dup rm -f README @@ -106,9 +107,9 @@ ant \ -Dcom.mysql.jdbc.jdk8.javac=%javac \ -Dsnapshot.version= \ -Dcom.mysql.jdbc.extra.libs=lib \ - -Dant.java.version=1.5 \ + -Dant.java.version=1.6 \ -Dant.build.javac.source=1.6 \ - -Dant.build.javac.target=1.7 \ + -Dant.build.javac.target=1.6 \ dist %install @@ -127,7 +128,6 @@ sed -i 's/>@.*%{version} Date: Fri, 6 Oct 2017 12:38:26 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=48 --- mysql-connector-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 19516a5..149cbbf 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -37,7 +37,7 @@ BuildRequires: ant BuildRequires: ant-contrib BuildRequires: apache-commons-logging BuildRequires: geronimo-jta-1_1-api -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit