!36 [sync] PR-32: Update to version 3.5.10

From: @openeuler-sync-bot 
Reviewed-by: @DingliZhang 
Signed-off-by: @DingliZhang

0001-add-javadoc-plugin-in-pom-file.patch

@@ -1,36 +0,0 @@
-From 6cb2a3b9e3b74870eeec0e8aab7a5dc4d18d68e7 Mon Sep 17 00:00:00 2001
-From: wang--ge <wang__ge@126.com>
-Date: Wed, 19 Jan 2022 10:50:47 +0800
-Subject: [PATCH] add javadoc plugin in pom file
-
----
- pom.xml | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/pom.xml b/pom.xml
-index 9adf834..eb431ae 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -356,6 +356,19 @@
-           </excludes>
-         </configuration>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-javadoc-plugin</artifactId>
-+        <version>3.0.0-M1</version>
-+        <executions>
-+          <execution>
-+            <id>attach-javadocs</id>
-+            <goals>
-+              <goal>jar</goal>
-+            </goals>
-+          </execution>
-+        </executions>
-+      </plugin>
-     </plugins>
- 
-     <resources>
--- 
-2.30.0
-

mybatis.spec

@@ -1,18 +1,24 @@
 %bcond_with test
 Name:                mybatis
-Version:             3.5.8
-Release:             2
+Version:             3.5.10
+Release:             1
 Summary:             SQL Mapping Framework for Java
 License:             Apache 2.0
 URL:                 https://github.com/mybatis/mybatis-3
 Source0:             https://github.com/mybatis/mybatis-3/archive/%{name}-%{version}.tar.gz
-Source1:             mssql-jdbc-9.4.0.jre8.jar
-Source2:             ognl-3.3.0.jar
-Source3:             mybatis-parent-33.pom
-Source4:             oss-parent-9.pom
-Source5:             xmvn-reactor
-Patch0:              0001-add-javadoc-plugin-in-pom-file.patch
+BuildRequires:       mvn(net.java.dev.jna:jna)
+BuildRequires:       mvn(org.apache.maven.wagon:wagon-ssh-common)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-site-plugin)
+BuildRequires:       mvn(org.apache.logging.log4j:log4j-core)
+BuildRequires:       mvn(ch.qos.logback:logback-classic)
+BuildRequires:       mvn(org.apache.derby:derby)
+BuildRequires:       mvn(net.bytebuddy:byte-buddy)
+BuildRequires:       mvn(com.fasterxml.jackson.core:jackson-annotations)
 BuildRequires:       maven maven-local java-1.8.0-openjdk-devel
+BuildRequires:       mvn(org.eclipse.aether:aether-connector-basic)
+BuildRequires:       mvn(org.eclipse.aether:aether-transport-wagon)
+BuildRequires:       mvn(org.apache.maven.wagon:wagon-http)
+BuildRequires:       mvn(org.apache.maven.wagon:wagon-provider-api)
 Requires:            java-1.8.0-openjdk javapackages-tools
 BuildArch:           noarch
 
@@ -40,38 +46,26 @@ Summary:             Javadoc for %{name}
 This package contains javadoc for %{name}.
 
 %prep
-mvn install:install-file -DgroupId=org.mybatis -DartifactId=mybatis-parent -Dversion=33 -Dpackaging=pom -Dfile=%{SOURCE3}
-mvn install:install-file -DgroupId=org.sonatype.oss -DartifactId=oss-parent -Dversion=9 -Dpackaging=pom -Dfile=%{SOURCE4}
 %autosetup -n %{name}-3-%{name}-%{version} -p1
-%pom_remove_dep org.slf4j:slf4j-log4j12
+%pom_remove_parent
+%pom_xpath_inject "pom:project" "<groupId>org.mybatis</groupId>"
+%pom_xpath_inject "pom:properties" "<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>"
+%pom_xpath_inject "pom:properties" "<encoding>UTF-8</encoding>"
+%pom_xpath_inject "pom:properties" "<java.version>1.8</java.version>"
+%pom_xpath_inject "pom:properties" "<maven.compiler.source>1.8</maven.compiler.source>"
+%pom_xpath_inject "pom:properties" "<maven.compiler.target>1.8</maven.compiler.target>"
 %pom_remove_plugin :maven-pdf-plugin
+%pom_remove_plugin :maven-surefire-plugin
+%pom_remove_plugin :maven-shade-plugin
 sed -i 's/\r//' LICENSE NOTICE
-%if %{with test}
-%pom_remove_dep javax.transaction:transaction-api
-%pom_add_dep org.apache.geronimo.specs:geronimo-jta_1.1_spec::test
-rm src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
-rm src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/MultipleResultSetTest.java \
- src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java \
- src/test/java/org/apache/ibatis/submitted/resultmapwithassociationstest/ResultMapWithAssociationsTest.java \
- src/test/java/org/apache/ibatis/submitted/nestedresulthandler_association/NestedResultHandlerAssociationTest.java
-rm src/test/java/org/apache/ibatis/logging/LogFactoryTest.java
-%endif
+rm src/test/java/org/apache/ibatis/cache/SoftCacheTest.java
 %mvn_file :%{name} %{name}
-mvn install:install-file -DgroupId=com.microsoft.sqlserver -DartifactId=mssql-jdbc -Dversion=9.4.0.jre8 -Dpackaging=jar -Dfile=%{SOURCE1}
-mvn install:install-file -DgroupId=ognl -DartifactId=ognl -Dversion=3.3.0 -Dpackaging=jar -Dfile=%{SOURCE2}
-cp %{SOURCE5} ./.xmvn-reactor
-echo `pwd` > absolute_prefix.log
-sed -i 's/\//\\\//g' absolute_prefix.log
-absolute_prefix=`head -n 1 absolute_prefix.log`
-sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor
 
 %build
-mvn -Dproject.build.sourceEncoding=UTF-8 -DskipTests package
+%mvn_build -b
 
 %install
 %mvn_install
-install -d -m 0755 %{buildroot}/%{_javadocdir}/%{name}
-install -m 0755 target/mybatis-3.5.8-javadoc.jar %{buildroot}/%{_javadocdir}/%{name}
 
 %files -f .mfiles
 %license LICENSE NOTICE
@@ -81,6 +75,9 @@ install -m 0755 target/mybatis-3.5.8-javadoc.jar %{buildroot}/%{_javadocdir}/%{n
 %license LICENSE NOTICE
 
 %changelog
+* Wed Apr 03 2024 Ge Wang <wang__ge@126.com> - 3.5.10-1
+- Upgrade to version 3.5.10
+
 * Mon Aug 22 2022 wangkai <wangkai385@h-partners.com> - 3.5.8-2
 - Rebuild for log4j 2.17.2 fix CVE-2021-44832
 

oss-parent-9.pom

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2007-2011 Sonatype, Inc. All rights reserved.
-  ~
-  ~ This program is licensed to you under the Apache License Version 2.0,
-  ~ and you may not use this file except in compliance with the Apache License Version 2.0.
-  ~ You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the Apache License Version 2.0 is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>9</version>
-    <packaging>pom</packaging>
-
-    <name>Sonatype OSS Parent</name>
-    <url>http://nexus.sonatype.org/oss-repository-hosting.html</url>
-    <description>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</description>
-
-    <scm>
-        <connection>scm:svn:http://svn.sonatype.org/spice/trunk/oss/oss-parenti-9</connection>
-        <developerConnection>scm:svn:https://svn.sonatype.org/spice/trunk/oss/oss-parent-9</developerConnection>
-        <url>http://svn.sonatype.org/spice/trunk/oss/oss-parent-9</url>
-    </scm>
-
-    <repositories>
-        <repository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>${sonatypeOssDistMgmtSnapshotsUrl}</url>
-        </snapshotRepository>
-        <repository>
-            <id>sonatype-nexus-staging</id>
-            <name>Nexus Release Repository</name>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.2</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version>
-                                    <message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.</message>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <mavenExecutorId>forked-path</mavenExecutorId>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <arguments>${arguments} -Psonatype-oss-release</arguments>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
-        <arguments />
-    </properties>
-
-    <profiles>
-        <profile>
-            <id>sonatype-oss-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.1.2</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.7</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.1</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>

xmvn-reactor

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
-  <artifacts>
-    <artifact>
-      <groupId>org.mybatis</groupId>
-      <artifactId>mybatis</artifactId>
-      <version>3.5.8</version>
-      <path>absolute-prefix/target/mybatis-3.5.8.jar</path>
-      <properties>
-        <type>jar</type>
-        <requiresJava>1.6</requiresJava>
-      </properties>
-      <dependencies>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <requestedVersion>1.7.5</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-          <requestedVersion>1.2.17</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <requestedVersion>2.0.2</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-          <requestedVersion>1.1.1</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>org.javassist</groupId>
-          <artifactId>javassist</artifactId>
-          <requestedVersion>3.17.1-GA</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-          <requestedVersion>2.2.2</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-      </dependencies>
-    </artifact>
-    <artifact>
-      <groupId>org.mybatis</groupId>
-      <artifactId>mybatis</artifactId>
-      <extension>pom</extension>
-      <version>3.5.8</version>
-      <path>absolute-prefix/pom.xml</path>
-      <properties>
-        <type>jar</type>
-        <requiresJava>1.6</requiresJava>
-      </properties>
-      <dependencies>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <requestedVersion>1.7.5</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-          <requestedVersion>1.2.17</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <requestedVersion>2.0.2</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-          <requestedVersion>1.1.1</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>org.javassist</groupId>
-          <artifactId>javassist</artifactId>
-          <requestedVersion>3.17.1-GA</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>cglib</groupId>
-          <artifactId>cglib</artifactId>
-          <requestedVersion>2.2.2</requestedVersion>
-          <optional>true</optional>
-        </dependency>
-      </dependencies>
-    </artifact>
-  </artifacts>
-</metadata>