From 8ef04dcacb2d005ad055350f8a5814b919bf345194c2154c4b413dad1ac5b4fe Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 18 Sep 2023 07:35:31 +0000
Subject: [PATCH 1/7] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=86

---
 mysql-connector-java-sequential.patch | 18 ++++++++++++++++++
 mysql-connector-java.spec             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 mysql-connector-java-sequential.patch

diff --git a/mysql-connector-java-sequential.patch b/mysql-connector-java-sequential.patch
new file mode 100644
index 0000000..361c39b
--- /dev/null
+++ b/mysql-connector-java-sequential.patch
@@ -0,0 +1,18 @@
+--- mysql-connector-j-8.1.0/build.xml	2023-09-18 09:29:29.026966561 +0200
++++ mysql-connector-j-8.1.0/build.xml	2023-09-18 09:30:04.777205839 +0200
+@@ -1129,6 +1129,7 @@
+     <target name="-compile-driver" depends="-init, -clean-classes">
+         <echo>Compiling MySQL Connector/J with '${com.mysql.cj.build.jdk}' to '${com.mysql.cj.build.compiler.output}'</echo>
+ 
++        <sequential>
+         <javac sourcepath=""
+                srcdir="${com.mysql.cj.build.dir.driver}"
+                destdir="${com.mysql.cj.build.compiler.output}"
+@@ -1169,6 +1170,7 @@
+             <arg value="${com.mysql.cj.build.compiler.output}" />
+             <arg value="${com.mysql.cj.build.verbose}" />
+         </java>
++        </sequential>
+     </target>
+ 
+ 
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index d1c008c..e6ef9bc 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -37,6 +37,7 @@ Patch0:         javac-check.patch
 #   The patch doesn't remove the file AuthenticationOciClient.java
 #   therefore it's removed during prep phase
 Patch1:         %{name}-remove-oci-support.patch
+Patch2:         %{name}-sequential.patch
 BuildRequires:  ant
 BuildRequires:  ant-contrib
 BuildRequires:  apache-commons-logging
@@ -80,6 +81,7 @@ set that supports the capabilities of MySQL.
 %setup -q -n mysql-connector-j-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150200
 # ship protobuf generated files compatible with protobuf 3.9.2

From 13b8e8f9bb7fe1b097ad5efe70a5d61e6cc702d0b08cde86d570918d0ac6c485 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 18 Sep 2023 07:40:29 +0000
Subject: [PATCH 2/7] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=87

---
 mysql-connector-java-sequential.patch | 28 +++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/mysql-connector-java-sequential.patch b/mysql-connector-java-sequential.patch
index 361c39b..2aef708 100644
--- a/mysql-connector-java-sequential.patch
+++ b/mysql-connector-java-sequential.patch
@@ -1,5 +1,5 @@
 --- mysql-connector-j-8.1.0/build.xml	2023-09-18 09:29:29.026966561 +0200
-+++ mysql-connector-j-8.1.0/build.xml	2023-09-18 09:30:04.777205839 +0200
++++ mysql-connector-j-8.1.0/build.xml	2023-09-18 09:39:31.004331066 +0200
 @@ -1129,6 +1129,7 @@
      <target name="-compile-driver" depends="-init, -clean-classes">
          <echo>Compiling MySQL Connector/J with '${com.mysql.cj.build.jdk}' to '${com.mysql.cj.build.compiler.output}'</echo>
@@ -8,7 +8,31 @@
          <javac sourcepath=""
                 srcdir="${com.mysql.cj.build.dir.driver}"
                 destdir="${com.mysql.cj.build.compiler.output}"
-@@ -1169,6 +1170,7 @@
+@@ -1148,7 +1149,7 @@
+         <java jvm="${com.mysql.cj.build.jdk.java}"
+               classname="instrumentation.CommonChecks"
+               classpathref="com.mysql.cj.build.instrumentation.classpath"
+-              fork="yes"
++              fork="no"
+               failonerror="true">
+             <arg value="${com.mysql.cj.build.compiler.output}" />
+             <arg value="${com.mysql.cj.build.verbose}" />
+@@ -1156,7 +1157,7 @@
+         <java jvm="${com.mysql.cj.build.jdk.java}"
+               classname="instrumentation.TranslateExceptions"
+               classpathref="com.mysql.cj.build.instrumentation.classpath"
+-              fork="yes"
++              fork="no"
+               failonerror="true">
+             <arg value="${com.mysql.cj.build.compiler.output}" />
+             <arg value="${com.mysql.cj.build.verbose}" />
+@@ -1164,11 +1165,12 @@
+         <java jvm="${com.mysql.cj.build.jdk.java}"
+               classname="instrumentation.AddMethods"
+               classpathref="com.mysql.cj.build.instrumentation.classpath"
+-              fork="yes"
++              fork="no"
+               failonerror="true">
              <arg value="${com.mysql.cj.build.compiler.output}" />
              <arg value="${com.mysql.cj.build.verbose}" />
          </java>

From f23382220586af1a0640fede7385c682d879f95c43b4c1a6e57a91fff0c6917e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 18 Sep 2023 07:58:04 +0000
Subject: [PATCH 3/7] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=88

---
 mysql-connector-java-sequential.patch | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/mysql-connector-java-sequential.patch b/mysql-connector-java-sequential.patch
index 2aef708..fd69e31 100644
--- a/mysql-connector-java-sequential.patch
+++ b/mysql-connector-java-sequential.patch
@@ -1,5 +1,5 @@
 --- mysql-connector-j-8.1.0/build.xml	2023-09-18 09:29:29.026966561 +0200
-+++ mysql-connector-j-8.1.0/build.xml	2023-09-18 09:39:31.004331066 +0200
++++ mysql-connector-j-8.1.0/build.xml	2023-09-18 09:57:49.098353360 +0200
 @@ -1129,6 +1129,7 @@
      <target name="-compile-driver" depends="-init, -clean-classes">
          <echo>Compiling MySQL Connector/J with '${com.mysql.cj.build.jdk}' to '${com.mysql.cj.build.compiler.output}'</echo>
@@ -8,7 +8,11 @@
          <javac sourcepath=""
                 srcdir="${com.mysql.cj.build.dir.driver}"
                 destdir="${com.mysql.cj.build.compiler.output}"
-@@ -1148,7 +1149,7 @@
+@@ -1145,30 +1146,34 @@
+             <classpath refid="com.mysql.cj.build.classpath" />
+             <compilerarg line="${javac.compilerarg}" />
+         </javac>
++        <sleep seconds="1"/>
          <java jvm="${com.mysql.cj.build.jdk.java}"
                classname="instrumentation.CommonChecks"
                classpathref="com.mysql.cj.build.instrumentation.classpath"
@@ -17,7 +21,8 @@
                failonerror="true">
              <arg value="${com.mysql.cj.build.compiler.output}" />
              <arg value="${com.mysql.cj.build.verbose}" />
-@@ -1156,7 +1157,7 @@
+         </java>
++        <sleep seconds="1"/>
          <java jvm="${com.mysql.cj.build.jdk.java}"
                classname="instrumentation.TranslateExceptions"
                classpathref="com.mysql.cj.build.instrumentation.classpath"
@@ -26,7 +31,8 @@
                failonerror="true">
              <arg value="${com.mysql.cj.build.compiler.output}" />
              <arg value="${com.mysql.cj.build.verbose}" />
-@@ -1164,11 +1165,12 @@
+         </java>
++        <sleep seconds="1"/>
          <java jvm="${com.mysql.cj.build.jdk.java}"
                classname="instrumentation.AddMethods"
                classpathref="com.mysql.cj.build.instrumentation.classpath"

From d9dbedeab20be187bc68fc6ede886eaaf81324a262c5b596fc6b72f1983a5324 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 18 Sep 2023 07:59:35 +0000
Subject: [PATCH 4/7] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=89

---
 mysql-connector-java-sequential.patch | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mysql-connector-java-sequential.patch b/mysql-connector-java-sequential.patch
index fd69e31..db0c767 100644
--- a/mysql-connector-java-sequential.patch
+++ b/mysql-connector-java-sequential.patch
@@ -1,6 +1,6 @@
 --- mysql-connector-j-8.1.0/build.xml	2023-09-18 09:29:29.026966561 +0200
-+++ mysql-connector-j-8.1.0/build.xml	2023-09-18 09:57:49.098353360 +0200
-@@ -1129,6 +1129,7 @@
++++ mysql-connector-j-8.1.0/build.xml	2023-09-18 09:59:22.378978201 +0200
+@@ -1129,12 +1129,13 @@
      <target name="-compile-driver" depends="-init, -clean-classes">
          <echo>Compiling MySQL Connector/J with '${com.mysql.cj.build.jdk}' to '${com.mysql.cj.build.compiler.output}'</echo>
  
@@ -8,6 +8,13 @@
          <javac sourcepath=""
                 srcdir="${com.mysql.cj.build.dir.driver}"
                 destdir="${com.mysql.cj.build.compiler.output}"
+                deprecation="off"
+                debug="${com.mysql.cj.build.addDebugInfo}"
+-               fork="yes"
++               fork="no"
+                executable="${com.mysql.cj.build.jdk.javac}"
+                compiler="modern"
+                includeantruntime="false"
 @@ -1145,30 +1146,34 @@
              <classpath refid="com.mysql.cj.build.classpath" />
              <compilerarg line="${javac.compilerarg}" />

From dbf8f531de7f38d93cf585ea9dcd8b52b7d1fbdb8e354af586629eb67585bf1a Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 18 Sep 2023 08:03:58 +0000
Subject: [PATCH 5/7] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=90

---
 mysql-connector-java-sequential.patch | 55 ---------------------------
 mysql-connector-java.spec             |  2 -
 2 files changed, 57 deletions(-)
 delete mode 100644 mysql-connector-java-sequential.patch

diff --git a/mysql-connector-java-sequential.patch b/mysql-connector-java-sequential.patch
deleted file mode 100644
index db0c767..0000000
--- a/mysql-connector-java-sequential.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- mysql-connector-j-8.1.0/build.xml	2023-09-18 09:29:29.026966561 +0200
-+++ mysql-connector-j-8.1.0/build.xml	2023-09-18 09:59:22.378978201 +0200
-@@ -1129,12 +1129,13 @@
-     <target name="-compile-driver" depends="-init, -clean-classes">
-         <echo>Compiling MySQL Connector/J with '${com.mysql.cj.build.jdk}' to '${com.mysql.cj.build.compiler.output}'</echo>
- 
-+        <sequential>
-         <javac sourcepath=""
-                srcdir="${com.mysql.cj.build.dir.driver}"
-                destdir="${com.mysql.cj.build.compiler.output}"
-                deprecation="off"
-                debug="${com.mysql.cj.build.addDebugInfo}"
--               fork="yes"
-+               fork="no"
-                executable="${com.mysql.cj.build.jdk.javac}"
-                compiler="modern"
-                includeantruntime="false"
-@@ -1145,30 +1146,34 @@
-             <classpath refid="com.mysql.cj.build.classpath" />
-             <compilerarg line="${javac.compilerarg}" />
-         </javac>
-+        <sleep seconds="1"/>
-         <java jvm="${com.mysql.cj.build.jdk.java}"
-               classname="instrumentation.CommonChecks"
-               classpathref="com.mysql.cj.build.instrumentation.classpath"
--              fork="yes"
-+              fork="no"
-               failonerror="true">
-             <arg value="${com.mysql.cj.build.compiler.output}" />
-             <arg value="${com.mysql.cj.build.verbose}" />
-         </java>
-+        <sleep seconds="1"/>
-         <java jvm="${com.mysql.cj.build.jdk.java}"
-               classname="instrumentation.TranslateExceptions"
-               classpathref="com.mysql.cj.build.instrumentation.classpath"
--              fork="yes"
-+              fork="no"
-               failonerror="true">
-             <arg value="${com.mysql.cj.build.compiler.output}" />
-             <arg value="${com.mysql.cj.build.verbose}" />
-         </java>
-+        <sleep seconds="1"/>
-         <java jvm="${com.mysql.cj.build.jdk.java}"
-               classname="instrumentation.AddMethods"
-               classpathref="com.mysql.cj.build.instrumentation.classpath"
--              fork="yes"
-+              fork="no"
-               failonerror="true">
-             <arg value="${com.mysql.cj.build.compiler.output}" />
-             <arg value="${com.mysql.cj.build.verbose}" />
-         </java>
-+        </sequential>
-     </target>
- 
- 
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index e6ef9bc..d1c008c 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -37,7 +37,6 @@ Patch0:         javac-check.patch
 #   The patch doesn't remove the file AuthenticationOciClient.java
 #   therefore it's removed during prep phase
 Patch1:         %{name}-remove-oci-support.patch
-Patch2:         %{name}-sequential.patch
 BuildRequires:  ant
 BuildRequires:  ant-contrib
 BuildRequires:  apache-commons-logging
@@ -81,7 +80,6 @@ set that supports the capabilities of MySQL.
 %setup -q -n mysql-connector-j-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150200
 # ship protobuf generated files compatible with protobuf 3.9.2

From bd28e9f07b7e5c930f2063afdb1f55ea18c9434e92837d5f145d55404121675e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 25 Sep 2023 07:19:28 +0000
Subject: [PATCH 6/7] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=91

---
 mysql-connector-java.spec | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index d1c008c..372080f 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -127,22 +127,19 @@ export CLASSPATH=$(build-classpath \
 install -d -m 755 %{buildroot}%{_javadir}
 
 install build/%{new_name}-%{version}-SNAPSHOT/%{new_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{new_name}.jar
+ln -sf %{_javadir}/%{new_name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 rm -rf %{buildroot}%{new_name}-%{version}/docs/release-test-output
 
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 
 # Install the Maven build information as new name
-install -pm 644 build/%{new_name}-%{version}-SNAPSHOT/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
+%mvn_install_pom build/%{new_name}-%{version}-SNAPSHOT/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
 sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
-%add_maven_depmap JPP-%{new_name}.pom %{new_name}.jar
-
-# Provide poms with "old name" mysql-connector-java (now it's mysql-connector-j)
-install -pm 644 build/%{new_name}-%{version}-SNAPSHOT/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{new_name}.jar
+%add_maven_depmap JPP-%{new_name}.pom %{new_name}.jar -a com.mysql:%{name}
 
 %files -f .mfiles
+%{_javadir}/%{name}.jar
 %license LICENSE
 %doc CHANGES README
 

From 5531fb9053bb839d2bafdefcd9d82122c16efdcd1cf59fc3f81d13341b60fffb Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 25 Sep 2023 09:45:29 +0000
Subject: [PATCH 7/7] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=92

---
 mysql-connector-java.changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes
index 66fce21..53c615d 100644
--- a/mysql-connector-java.changes
+++ b/mysql-connector-java.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 25 09:45:21 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Avoid producing dupplicate maven data
+
 -------------------------------------------------------------------
 Thu Sep  7 08:08:24 UTC 2023 - David Anes <david.anes@suse.com>