Fix build with jdk9
OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=47
This commit is contained in:
parent
3b93728b1b
commit
9e85268ed1
57
mysql-connector-java-sourcetarget.patch
Normal file
57
mysql-connector-java-sourcetarget.patch
Normal file
@ -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">
|
||||||
|
<include name="**/*.java" />
|
||||||
|
<exclude name="testsuite/**" />
|
||||||
|
<exclude name="com/mysql/jdbc/integration/**" />
|
||||||
|
@@ -930,9 +928,7 @@
|
||||||
|
fork="yes"
|
||||||
|
executable="${com.mysql.jdbc.jdk5.javac}"
|
||||||
|
compiler="modern"
|
||||||
|
- includeantruntime="false"
|
||||||
|
- source="1.5"
|
||||||
|
- target="1.5">
|
||||||
|
+ includeantruntime="false">
|
||||||
|
<include name="testsuite/**" />
|
||||||
|
<exclude name="testsuite/requiresNonRedists/**" />
|
||||||
|
<exclude name="testsuite/**/jdbc4*/**" />
|
||||||
|
@@ -993,9 +989,7 @@
|
||||||
|
fork="yes"
|
||||||
|
executable="${com.mysql.jdbc.jdk5.javac}"
|
||||||
|
compiler="modern"
|
||||||
|
- includeantruntime="false"
|
||||||
|
- source="1.5"
|
||||||
|
- target="1.5">
|
||||||
|
+ includeantruntime="false">
|
||||||
|
<include name="com/mysql/jdbc/integration/c3p0/**" />
|
||||||
|
<classpath refid="project.build.classpath" />
|
||||||
|
</javac>
|
||||||
|
@@ -1014,9 +1008,7 @@
|
||||||
|
fork="yes"
|
||||||
|
executable="${com.mysql.jdbc.jdk5.javac}"
|
||||||
|
compiler="modern"
|
||||||
|
- includeantruntime="false"
|
||||||
|
- source="1.5"
|
||||||
|
- target="1.5">
|
||||||
|
+ includeantruntime="false">
|
||||||
|
<include name="com/mysql/jdbc/integration/jboss/**" />
|
||||||
|
<classpath refid="project.build.classpath" />
|
||||||
|
</javac>
|
||||||
|
@@ -1035,9 +1027,7 @@
|
||||||
|
fork="yes"
|
||||||
|
executable="${com.mysql.jdbc.jdk5.javac}"
|
||||||
|
compiler="modern"
|
||||||
|
- includeantruntime="false"
|
||||||
|
- source="1.5"
|
||||||
|
- target="1.5">
|
||||||
|
+ includeantruntime="false">
|
||||||
|
<include name="com/mysql/jdbc/log/Log4JLogger.java" />
|
||||||
|
<classpath refid="project.build.classpath" />
|
||||||
|
</javac>
|
@ -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
|
Fri Sep 29 06:45:22 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
@ -32,11 +32,12 @@ Patch1: hibernate-check.patch
|
|||||||
Patch2: mysql-connector-java-jdbc-4.1.patch
|
Patch2: mysql-connector-java-jdbc-4.1.patch
|
||||||
Patch3: disable-testsuite.patch
|
Patch3: disable-testsuite.patch
|
||||||
Patch4: compile-jdk7.patch
|
Patch4: compile-jdk7.patch
|
||||||
|
Patch5: mysql-connector-java-sourcetarget.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: ant-contrib
|
BuildRequires: ant-contrib
|
||||||
BuildRequires: apache-commons-logging
|
BuildRequires: apache-commons-logging
|
||||||
BuildRequires: geronimo-jta-1_1-api
|
BuildRequires: geronimo-jta-1_1-api
|
||||||
BuildRequires: java-devel = 1.8.0
|
BuildRequires: java-devel
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
@ -51,7 +52,6 @@ Obsoletes: mm.mysql < %{version}
|
|||||||
# manual is no longer distributed
|
# manual is no longer distributed
|
||||||
Provides: %{name}-manual = %{version}
|
Provides: %{name}-manual = %{version}
|
||||||
Obsoletes: %{name}-manual < %{version}
|
Obsoletes: %{name}-manual < %{version}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -70,6 +70,7 @@ set that supports the capabilities of MySQL.
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
# dup
|
# dup
|
||||||
rm -f README
|
rm -f README
|
||||||
@ -106,9 +107,9 @@ ant \
|
|||||||
-Dcom.mysql.jdbc.jdk8.javac=%javac \
|
-Dcom.mysql.jdbc.jdk8.javac=%javac \
|
||||||
-Dsnapshot.version= \
|
-Dsnapshot.version= \
|
||||||
-Dcom.mysql.jdbc.extra.libs=lib \
|
-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.source=1.6 \
|
||||||
-Dant.build.javac.target=1.7 \
|
-Dant.build.javac.target=1.6 \
|
||||||
dist
|
dist
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -127,7 +128,6 @@ sed -i 's/>@.*</>%{version}</' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
|||||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc CHANGES COPYING README.txt
|
%doc CHANGES COPYING README.txt
|
||||||
%attr(0644,root,root) %{_javadir}/%{name}.jar
|
%attr(0644,root,root) %{_javadir}/%{name}.jar
|
||||||
%if %{defined _maven_repository}
|
%if %{defined _maven_repository}
|
||||||
|
Loading…
Reference in New Issue
Block a user