diff --git a/0001-add-javadoc-plugin-in-pom-file.patch b/0001-add-javadoc-plugin-in-pom-file.patch new file mode 100644 index 0000000000000000000000000000000000000000..d8647c7915a7d9a930e316b59a45aa8422190ab9 --- /dev/null +++ b/0001-add-javadoc-plugin-in-pom-file.patch @@ -0,0 +1,36 @@ +From 6cb2a3b9e3b74870eeec0e8aab7a5dc4d18d68e7 Mon Sep 17 00:00:00 2001 +From: wang--ge +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 @@ + + + ++ ++ org.apache.maven.plugins ++ maven-javadoc-plugin ++ 3.0.0-M1 ++ ++ ++ attach-javadocs ++ ++ jar ++ ++ ++ ++ + + + +-- +2.30.0 + diff --git a/CVE-2020-26945.patch b/CVE-2020-26945.patch deleted file mode 100644 index 401d3c2987e1f265789018842f5735d47140a104..0000000000000000000000000000000000000000 --- a/CVE-2020-26945.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 9caf480e05c389548c9889362c2cb080d728b5d8 Mon Sep 17 00:00:00 2001 -From: Iwao AVE! -Date: Sat, 3 Oct 2020 23:58:09 +0900 -Subject: [PATCH] Output warning when deserializing object stream with no - JEP-290 filter defined - ---- - .../cache/decorators/SerializedCache.java | 2 + - .../loader/AbstractSerialStateHolder.java | 6 ++ - .../apache/ibatis/io/SerialFilterChecker.java | 54 +++++++++++++++++++ - 3 files changed, 61 insertions(+), 33 deletions(-) - create mode 100644 src/main/java/org/apache/ibatis/io/SerialFilterChecker.java - -diff --git a/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java b/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java -index aeb3d09de7a..664b214aa65 100644 ---- a/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java -+++ b/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java -@@ -28,6 +28,7 @@ - import org.apache.ibatis.cache.Cache; - import org.apache.ibatis.cache.CacheException; - import org.apache.ibatis.io.Resources; -+import org.apache.ibatis.io.SerialFilterChecker; - - /** - * @author Clinton Begin -@@ -104,6 +105,7 @@ public boolean equals(Object obj) { - } - - private Serializable deserialize(byte[] value) { -+ SerialFilterChecker.check(); - Serializable result; - try { - ByteArrayInputStream bis = new ByteArrayInputStream(value); -diff --git a/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java b/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java -index f1edbaa146a..414fe5db391 100644 ---- a/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java -+++ b/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java -@@ -31,6 +31,7 @@ - import java.util.List; - import java.util.Map; - -+import org.apache.ibatis.io.SerialFilterChecker; - import org.apache.ibatis.reflection.factory.ObjectFactory; - - /** -@@ -106,9 +107,11 @@ protected final Object readResolve() throws ObjectStreamException { - return this.userBean; - } - -+ SerialFilterChecker.check(); -+ - /* First run */ - try { - final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(this.userBeanBytes)); - this.userBean = in.readObject(); - this.unloadedProperties = (Map) in.readObject(); - this.objectFactory = (ObjectFactory) in.readObject(); -diff --git a/src/main/java/org/apache/ibatis/io/SerialFilterChecker.java b/src/main/java/org/apache/ibatis/io/SerialFilterChecker.java -new file mode 100644 -index 00000000000..abacac68332 ---- /dev/null -+++ b/src/main/java/org/apache/ibatis/io/SerialFilterChecker.java -@@ -0,0 +1,54 @@ -+/** -+ * Copyright 2009-2020 the original author or authors. -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+package org.apache.ibatis.io; -+ -+import java.security.Security; -+ -+import org.apache.ibatis.logging.Log; -+import org.apache.ibatis.logging.LogFactory; -+ -+public final class SerialFilterChecker { -+ private static final Log log = LogFactory.getLog(SerialFilterChecker.class); -+ /* Property key for the JEP-290 serialization filters */ -+ private static final String JDK_SERIAL_FILTER = "jdk.serialFilter"; -+ private static final boolean SERIAL_FILTER_MISSING; -+ private static boolean firstInvocation = true; -+ -+ static { -+ Object serialFilter; -+ try { -+ Class objectFilterConfig = Class.forName("java.io.ObjectInputFilter$Config"); -+ serialFilter = objectFilterConfig.getMethod("getSerialFilter").invoke(null); -+ } catch (ReflectiveOperationException e) { -+ // Java 1.8 -+ serialFilter = System.getProperty(JDK_SERIAL_FILTER, Security.getProperty(JDK_SERIAL_FILTER)); -+ } -+ SERIAL_FILTER_MISSING = serialFilter == null; -+ } -+ -+ public static void check() { -+ if (firstInvocation && SERIAL_FILTER_MISSING) { -+ firstInvocation = false; -+ log.warn( -+ "As you are using functionality that deserializes object streams, it is recommended to define the JEP-290 serial filter. " -+ + "Please refer to https://docs.oracle.com/pls/topic/lookup?ctx=javase15&id=GUID-8296D8E8-2B93-4B9A-856E-0A65AF9B8C66"); -+ } -+ } -+ -+ private SerialFilterChecker() { -+ } -+} diff --git a/mssql-jdbc-9.4.0.jre8.jar b/mssql-jdbc-9.4.0.jre8.jar new file mode 100644 index 0000000000000000000000000000000000000000..8371919e65d1f0e403c4df4dc9a442d4f5ebc945 Binary files /dev/null and b/mssql-jdbc-9.4.0.jre8.jar differ diff --git a/mybatis-3.2.8-commons-ognl.patch b/mybatis-3.2.8-commons-ognl.patch deleted file mode 100644 index 193828f54752e1b5ae7bb3b816f5f491f0c971db..0000000000000000000000000000000000000000 --- a/mybatis-3.2.8-commons-ognl.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Nru mybatis-3-mybatis-3.2.8/pom.xml mybatis-3-mybatis-3.2.8-gil/pom.xml ---- mybatis-3-mybatis-3.2.8/pom.xml 2014-10-10 18:44:34.000000000 +0200 -+++ mybatis-3-mybatis-3.2.8-gil/pom.xml 2014-12-26 14:27:03.038441294 +0100 -@@ -136,9 +136,9 @@ - - - -- ognl -- ognl -- 2.6.9 -+ org.apache.commons -+ commons-ognl -+ 4.0-incubating-SNAPSHOT - provided - true - -diff -Nru mybatis-3-mybatis-3.2.8/src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java mybatis-3-mybatis-3.2.8-gil/src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java ---- mybatis-3-mybatis-3.2.8/src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java 2014-10-10 18:44:34.000000000 +0200 -+++ mybatis-3-mybatis-3.2.8-gil/src/main/java/org/apache/ibatis/scripting/xmltags/DynamicContext.java 2014-12-26 14:30:00.065088895 +0100 -@@ -18,9 +18,9 @@ - import java.util.HashMap; - import java.util.Map; - --import ognl.OgnlException; --import ognl.OgnlRuntime; --import ognl.PropertyAccessor; -+import org.apache.commons.ognl.OgnlException; -+import org.apache.commons.ognl.OgnlRuntime; -+import org.apache.commons.ognl.MapPropertyAccessor; - - import org.apache.ibatis.reflection.MetaObject; - import org.apache.ibatis.session.Configuration; -@@ -107,7 +107,7 @@ - } - } - -- static class ContextAccessor implements PropertyAccessor { -+ static class ContextAccessor extends MapPropertyAccessor { - - public Object getProperty(Map context, Object target, Object name) - throws OgnlException { -diff -Nru mybatis-3-mybatis-3.2.8/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java mybatis-3-mybatis-3.2.8-gil/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java ---- mybatis-3-mybatis-3.2.8/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java 2014-10-10 18:44:34.000000000 +0200 -+++ mybatis-3-mybatis-3.2.8-gil/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java 2014-12-26 14:31:45.179409686 +0100 -@@ -19,8 +19,8 @@ - import java.util.Map; - import java.util.concurrent.ConcurrentHashMap; - --import ognl.Ognl; --import ognl.OgnlException; -+import org.apache.commons.ognl.Ognl; -+import org.apache.commons.ognl.OgnlException; - - import org.apache.ibatis.builder.BuilderException; - -diff -Nru mybatis-3-mybatis-3.2.8/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java mybatis-3-mybatis-3.2.8-gil/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java ---- mybatis-3-mybatis-3.2.8/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java 2014-10-10 18:44:34.000000000 +0200 -+++ mybatis-3-mybatis-3.2.8-gil/src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java 2014-12-26 14:32:53.568668180 +0100 -@@ -19,7 +19,7 @@ - import java.util.HashMap; - import java.util.Map; - --import ognl.ClassResolver; -+import org.apache.commons.ognl.ClassResolver; - - import org.apache.ibatis.io.Resources; - diff --git a/mybatis-3.2.8-log4j2.6.patch b/mybatis-3.2.8-log4j2.6.patch deleted file mode 100644 index 33f06d9fa719c316f361a747d7753cc4b1e09dba..0000000000000000000000000000000000000000 --- a/mybatis-3.2.8-log4j2.6.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nru mybatis-3-mybatis-3.2.8/src/main/java/org/apache/ibatis/logging/log4j2/Log4j2AbstractLoggerImpl.java mybatis-3-mybatis-3.2.8.log4j2/src/main/java/org/apache/ibatis/logging/log4j2/Log4j2AbstractLoggerImpl.java ---- mybatis-3-mybatis-3.2.8/src/main/java/org/apache/ibatis/logging/log4j2/Log4j2AbstractLoggerImpl.java 2014-10-10 18:44:34.000000000 +0200 -+++ mybatis-3-mybatis-3.2.8.log4j2/src/main/java/org/apache/ibatis/logging/log4j2/Log4j2AbstractLoggerImpl.java 2016-08-25 12:32:27.624998558 +0200 -@@ -51,27 +51,27 @@ - - @Override - public void error(String s, Throwable e) { -- log.logIfEnabled(FQCN, Level.ERROR, MARKER, new SimpleMessage(s), e); -+ log.logIfEnabled(FQCN, Level.ERROR, MARKER, s, e); - } - - @Override - public void error(String s) { -- log.logIfEnabled(FQCN, Level.ERROR, MARKER, new SimpleMessage(s), null); -+ log.logIfEnabled(FQCN, Level.ERROR, MARKER, s, (Throwable) null); - } - - @Override - public void debug(String s) { -- log.logIfEnabled(FQCN, Level.DEBUG, MARKER, new SimpleMessage(s), null); -+ log.logIfEnabled(FQCN, Level.DEBUG, MARKER, s, (Throwable) null); - } - - @Override - public void trace(String s) { -- log.logIfEnabled(FQCN, Level.TRACE, MARKER, new SimpleMessage(s), null); -+ log.logIfEnabled(FQCN, Level.TRACE, MARKER, s, (Throwable) null); - } - - @Override - public void warn(String s) { -- log.logIfEnabled(FQCN, Level.WARN, MARKER, new SimpleMessage(s), null); -+ log.logIfEnabled(FQCN, Level.WARN, MARKER, s, (Throwable) null); - } - - } diff --git a/mybatis-3.2.8.tar.gz b/mybatis-3.2.8.tar.gz deleted file mode 100644 index c63c9b992a6bc5a3bea0eb0b76d7c657d9c29a44..0000000000000000000000000000000000000000 Binary files a/mybatis-3.2.8.tar.gz and /dev/null differ diff --git a/mybatis-3.5.8.tar.gz b/mybatis-3.5.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8740c8fe83bc985808e823b5aeac1a66e12b9c74 Binary files /dev/null and b/mybatis-3.5.8.tar.gz differ diff --git a/mybatis-parent-33.pom b/mybatis-parent-33.pom new file mode 100644 index 0000000000000000000000000000000000000000..215d39c93ce8c668e055e5a9300d3c423f402b9b --- /dev/null +++ b/mybatis-parent-33.pom @@ -0,0 +1,1364 @@ + + + + 4.0.0 + + org.mybatis + mybatis-parent + 33 + pom + + mybatis-parent + The MyBatis parent POM. + https://www.mybatis.org/ + 2010 + + MyBatis.org + https://www.mybatis.org/ + + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + cbegin + Clinton Begin + clinton.begin@gmail.com + + Owner + Founder + Committer + + + + + brandon.goodin + Brandon Goodin + brandon.goodin@gmail.com + + Committer + + + + + christianpoitras + Christian Poitras + christian.poitras@ircm.qc.ca + -5 + + Committer + + + + + emacarron + Eduardo Macarron + eduardo.macarron@gmail.com + + Committer + + + + + mnesarco + Frank Martinez + mnesarco@gmail.com + + Committer + + + + + agustafson + Andrew Gustafson + gus4000@gmail.com + + Committer + + + + + hpresnall + Hunter Presnall + hpresnall@gmail.com + + Committer + + + + + harawata + Iwao Ave + harawata@gmail.com + + Committer + + + + + jeffgbutler + Jeff Butler + jeffgbutler@gmail.com + + Committer + + + + + hazendaz + Jeremy Landis + jeremylandis@hotmail.com + + Committer + + -5 + + + + nospam@kaigrabfelder.de + Kai Grabfelder + nospam@kaigrabfelder.de + + Committer + + + + + lmeadors + Larry Meadors + larry.meadors@gmail.com + + Committer + + + + + marcosperanza + Marco Speranza + marco.speranza79@gmail.com + +1 + + Committer + + + + + nmaves + Nathan Maves + nathan.maves@gmail.com + + Committer + + + + + pboonphong + Putthiphong Boonphong + putthiphong.boonphong@gmail.com + + Committer + + + + + simonetripodi + Simone Tripodi + simone.tripodi@gmail.com + +1 + + Committer + + + + + h3adache + Tim Chen + chengt@gmail.com + + Committer + + + + + + + mybatis-dev + https://groups.google.com/forum/#!forum/mybatis-dev + https://groups.google.com/forum/#!forum/mybatis-dev/join + https://groups.google.com/forum/#!forum/mybatis-dev/join + mybatis-dev@googlegroups.com + + + + mybatis-user + https://groups.google.com/forum/#!forum/mybatis-user + https://groups.google.com/forum/#!forum/mybatis-user/join + https://groups.google.com/forum/#!forum/mybatis-user/join + mybatis-user@googlegroups.com + + http://mybatis-user.963551.n3.nabble.com/ + + + + + mybatis-commits + https://groups.google.com/forum/#!forum/mybatis-commits + https://groups.google.com/forum/#!forum/mybatis-commits/join + https://groups.google.com/forum/#!forum/mybatis-commits/join + mybatis-commits@googlegroups.com + + + + + https://github.com/mybatis/parent + scm:git:ssh://github.com/mybatis/parent.git + scm:git:ssh://git@github.com/mybatis/parent.git + mybatis-parent-33 + + + GitHub Issue Management + https://github.com/mybatis/parent/issues + + + Travis CI + https://travis-ci.org/mybatis/parent + + + + gh-pages + Mybatis GitHub Pages + github:ssh://mybatis.github.io/parent/ + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + checkstyle.xml + 32 + eclipse-formatter-config-2space.xml + ${project.name} + -html5 + au,com,de,java,javassist,javax,lombok,mockit,net,ognl,org + 3.2.5 + org.mybatis.parent + + + + yyyy-MM-dd HH:mm:ssZ + 1.8 + 1.8 + 1.8 + 1.8 + UTF-8 + UTF-8 + UTF-8 + + + 9.1 + 9 + 2.3.3 + 5.3.0 + 1.2.6 + 8.42 + 1.9 + 2.0.3 + 3.4.3 + + + 1.20 + 3.0.0 + 3.3.0 + 5.1.2 + 2.12.1 + 3.1.2 + 3.1.0 + 2.8 + 3.8.1 + 4.3.0 + 3.1.2 + 3.0.0-M1 + 3.0.0-M1 + 2.15.0 + 1.6 + 1.6.0 + 3.0.0-M1 + 0.8.7 + 3.2.0 + 3.2.0 + 3.1.1 + 4.1 + 1.0.0 + 2.2.0 + 1.4 + 3.14.0 + 3.1.2 + 3.0.0-M4 + 3.2.0 + 1.11.2 + 3.2.4 + 3.9.1 + 3.2.1 + 4.2.3 + 3.0.0-M5 + 2.4 + 2.8.1 + 1.0.4 + + + ${project.groupId}.${project.artifactId} + ${project.groupId}.*;version=${project.version};-noimport:=true + * + + + + + org.codehaus.mojo.signature + java18 + 1.0 + + + + + + + + + + + com.mycila + license-maven-plugin + ${license.version} + +
${project.basedir}/license.txt
+ + **/*.ctrl + **/*.dat + ICLA + KEYS + NOTICE + + + XML_STYLE + +
+ + + com.mycila + license-maven-plugin-git + ${license.version} + + +
+ + + + org.apache.maven.plugins + maven-antrun-plugin + ${antrun.version} + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${assembly.version} + + + + org.apache.maven.plugins + maven-clean-plugin + ${clean.version} + + + + org.apache.maven.plugins + maven-compiler-plugin + ${compiler.version} + + true + + false + + + + + org.eluder.coveralls + coveralls-maven-plugin + ${coveralls.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${bind-api.version} + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${dependency.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${deploy.version} + + + + org.apache.maven.plugins + maven-install-plugin + ${install.version} + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.version} + + true + + + + + org.apache.maven.plugins + maven-pdf-plugin + ${pdf.version} + + + pdf + prepare-package + + pdf + + + false + + + + + + + org.apache.maven.plugins + maven-release-plugin + ${release.version} + + true + forked-path + false + release + + + + + org.apache.maven.plugins + maven-resources-plugin + ${resources.version} + + + + org.apache.maven.plugins + maven-shade-plugin + ${shade.version} + + + + org.apache.maven.plugins + maven-site-plugin + ${site.version} + + + attach-descriptor + + attach-descriptor + + + + + + net.trajano.wagon + wagon-git + ${wagon-git.version} + + + org.apache.maven.wagon + wagon-ssh + ${wagon-ssh.version} + + + + org.apache.maven.skins + maven-fluido-skin + ${fluido.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + + ${argLine} -Djdk.attach.allowAttachSelf + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + org.codehaus.mojo + versions-maven-plugin + ${versions.version} + + + + net.revelc.code.formatter + formatter-maven-plugin + ${formatter.version} + + + com.github.hazendaz + build-tools + ${build-tools.version} + + + + + + net.revelc.code + impsort-maven-plugin + ${impsort.version} + + ${impsortGroups} + java,* + true + + + + + com.github.dantwining.whitespace-maven-plugin + whitespace-maven-plugin + ${whitespace.version} + + + + org.gaul + modernizer-maven-plugin + ${modernizer.plugin} + + false + ${maven.compiler.target} + + + + org.ow2.asm + asm + ${asm.version} + + + + +
+
+ + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle.plugin} + + + com.puppycrawl.tools + checkstyle + ${checkstyle-core.version} + + + com.github.hazendaz + build-tools + ${build-tools.version} + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${enforcer.version} + + + enforce-java + validate + + enforce + + + + + [${maven.compiler.source},) + + + [${maven.min-version},) + + + [ERROR] Best Practice is to always define plugin versions! + true + true + true + clean,deploy,site + + + + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + ${animal.version} + + + ${signature.group} + ${signature.artifact} + ${signature.version} + + + + org.apache.ibatis.lang.UsesJava7 + org.apache.ibatis.lang.UsesJava8 + + + + + check-java-compat + process-classes + + check + + + + + + + org.apache.felix + maven-bundle-plugin + ${bundle.version} + + + biz.aQute.bnd + biz.aQute.bndlib + ${bnd.version} + + + + + bundle-manifest + process-classes + + manifest + + + + + true + ${project.build.directory}/osgi + + jar + bundle + war + maven-plugin + + + + <_nouses>true + + <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME,JAVA_1_8_HOME,JAVA_1_9_HOME,JAVA_8_HOME,JAVA_9_HOME,JAVA_10_HOME,JAVA_11_HOME,JAVA_12_HOME,JAVA_13_HOME,JAVA_14_HOME,JAVA_15_HOME + ${osgi.symbolicName} + ${osgi.export} + ${osgi.private} + ${osgi.import} + ${osgi.dynamicImport} + ${project.url} + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${jar.version} + + + ${project.build.directory}/osgi/MANIFEST.MF + + true + true + true + + + ${module.name} + ${maven.build.timestamp} + ${maven.compiler.source} + ${maven.compiler.target} + + + + + + + org.codehaus.mojo + clirr-maven-plugin + ${clirr.version} + + ${clirr.comparisonVersion} + false + false + + + + + org.apache.maven.plugins + maven-scm-plugin + ${scm.version} + + + + org.jacoco + jacoco-maven-plugin + + + prepare-agent + + prepare-agent + + + + report + + report + + + + + + + whitespace-maven-plugin + com.github.dantwining.whitespace-maven-plugin + + + process-sources + + trim + + + + + + + org.gaul + modernizer-maven-plugin + + + modernizer + verify + + modernizer + + + + + + + + + ${project.basedir}/src/main/resources + true + + + ${project.basedir} + META-INF + + LICENSE + NOTICE + + + + + + org.apache.maven.wagon + wagon-ssh + ${wagon-ssh.version} + + +
+ + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${project-info.version} + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.version} + + + default + + javadoc + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + ${jxr.version} + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs.version} + + true + ${project.build.directory}/spotbugs-reports + ${project.build.directory}/spotbugs-reports + High + Max + FindDeadLocalStores,UnreadFields + ${spotbugs.onlyAnalyze} + true + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${surefire.version} + + + + org.apache.maven.plugins + maven-changes-plugin + ${changes.version} + + %URL%/issues/%ISSUE% + + + + + changes-report + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle.plugin} + + ${checkstyle.config} + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${pmd.version} + + true + true + 100 + + + + + org.codehaus.mojo + taglist-maven-plugin + ${taglist.version} + + + + + Todo Work + + + TODO + ignoreCase + + + FIXME + ignoreCase + + + + + + + + + + org.codehaus.mojo + clirr-maven-plugin + ${clirr.version} + + ${clirr.comparisonVersion} + + + + + + org.codehaus.mojo + versions-maven-plugin + ${versions.version} + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + + report + + + + + + + + + + + format + + + format.xml + + + + + + net.revelc.code.formatter + formatter-maven-plugin + + ${formatter.config} + true + + + + + format + + + + + + net.revelc.code + impsort-maven-plugin + + + + sort + + + + + + + + + + jdk9on + + [9,) + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${html.javadocType} + + + + + + + + + release + + + + org.apache.maven.plugins + maven-source-plugin + ${source.version} + + + attach-sources + + jar-no-fork + + + + + true + true + true + + + ${maven.build.timestamp} + ${maven.compiler.source} + ${maven.compiler.target} + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.version} + + + attach-javadocs + + jar + + + + + true + true + + + ${maven.build.timestamp} + ${maven.compiler.source} + ${maven.compiler.target} + + + -Xdoclint:-missing + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${gpg.version} + + + sign-artifacts + verify + + sign + + + + + + + + + + + travis-ci + + + env.TRAVIS + + + + + + + + + bundle + + false + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${assembly.version} + + + org.mybatis + base-bundle-descriptor + ${base-bundle.version} + + + + + package + + single + + + true + false + + base-bundle + + + + + + + + + + + sort + + + + org.codehaus.mojo + tidy-maven-plugin + 1.1.0 + + + verify + + pom + + + + + + + + + + license + + + + ${basedir}/license.txt + + + + + + com.mycila + license-maven-plugin + + + compile + + format + + + + + + + + + + eclipse + + + m2e.version + + + + + + + + org.eclipse.m2e + lifecycle-mapping + ${lifecycle.version} + + + + + + org.apache.felix + maven-bundle-plugin + [${bundle.version},) + + manifest + + + + + + + + + org.jacoco + jacoco-maven-plugin + [${jacoco.version},) + + prepare-agent + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [${enforcer.version},) + + enforce + + + + + + + + + com.mycila + license-maven-plugin + [${license.version},) + + format + + + + + + + + + net.revelc.code.formatter + formatter-maven-plugin + [${formatter.version},) + + format + + + + + + + + + net.revelc.code + impsort-maven-plugin + [${impsort.plugin},) + + sort + + + + + true + true + + + + + + com.github.dantwining.whitespace-maven-plugin + whitespace-maven-plugin + [${whitespace.plugin},) + + trim + + + + + true + true + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.testSource} + ${maven.compiler.testTarget} + + + + + + + + +
diff --git a/mybatis.spec b/mybatis.spec index 7fe00f636e41dca73678bb2e8e014f174520ab69..6ae131484b359e2f16b4e964e4033e97bed661fc 100644 --- a/mybatis.spec +++ b/mybatis.spec @@ -1,27 +1,19 @@ %bcond_with test Name: mybatis -Version: 3.2.8 -Release: 2 +Version: 3.5.8 +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 -Patch0: %{name}-%{version}-commons-ognl.patch -Patch1: mybatis-3.2.8-log4j2.6.patch -Patch2: CVE-2020-26945.patch -BuildRequires: maven-local mvn(cglib:cglib) mvn(commons-logging:commons-logging) -BuildRequires: mvn(log4j:log4j:1.2.17) mvn(org.apache.commons:commons-ognl) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.logging.log4j:log4j-core) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin) mvn(org.javassist:javassist) -BuildRequires: mvn(org.mybatis:mybatis-parent:pom:) mvn(org.slf4j:slf4j-api) -%if %{with test} -BuildRequires: mvn(commons-dbcp:commons-dbcp) mvn(junit:junit) mvn(org.apache.derby:derby) -BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec) -BuildRequires: mvn(org.apache.geronimo.specs:specs:pom:) mvn(org.apache.velocity:velocity) -BuildRequires: mvn(org.hsqldb:hsqldb) mvn(org.mockito:mockito-core) mvn(postgresql:postgresql) -%endif +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: maven maven-local java-1.8.0-openjdk-devel +Requires: java-1.8.0-openjdk javapackages-tools BuildArch: noarch %description @@ -48,11 +40,11 @@ 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_plugin :maven-pdf-plugin -%pom_remove_plugin :jarjar-maven-plugin -%pom_remove_plugin :cobertura-maven-plugin sed -i 's/\r//' LICENSE NOTICE %if %{with test} %pom_remove_dep javax.transaction:transaction-api @@ -65,24 +57,33 @@ rm src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/M rm src/test/java/org/apache/ibatis/logging/LogFactoryTest.java %endif %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 -%if %{without test} -opts="-f" -%endif -%mvn_build $opts -- -Dproject.build.sourceEncoding=UTF-8 - +mvn -Dproject.build.sourceEncoding=UTF-8 -DskipTests package %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 -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/mybatis %license LICENSE NOTICE %changelog +* Tue Apr 19 2022 wangkai - 3.5.8-1 +- Upgrade 3.5.8 + * Sat Jun 19 2021 lingsheng - 3.2.8-2 - Fix CVE-2020-26945 diff --git a/ognl-3.3.0.jar b/ognl-3.3.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..c5230b5efc77c1b806771c89536cb068e4c5e339 Binary files /dev/null and b/ognl-3.3.0.jar differ diff --git a/oss-parent-9.pom b/oss-parent-9.pom new file mode 100644 index 0000000000000000000000000000000000000000..cc10b9821d6a042dc418d8016baa3a2263183d46 --- /dev/null +++ b/oss-parent-9.pom @@ -0,0 +1,156 @@ + + + + 4.0.0 + + org.sonatype.oss + oss-parent + 9 + pom + + Sonatype OSS Parent + http://nexus.sonatype.org/oss-repository-hosting.html + Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/ + + + scm:svn:http://svn.sonatype.org/spice/trunk/oss/oss-parenti-9 + scm:svn:https://svn.sonatype.org/spice/trunk/oss/oss-parent-9 + http://svn.sonatype.org/spice/trunk/oss/oss-parent-9 + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + ${sonatypeOssDistMgmtSnapshotsUrl} + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.2 + + + enforce-maven + + enforce + + + + + (,2.1.0),(2.1.0,2.2.0),(2.2.0,) + Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively. + + + + + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + + forked-path + false + ${arguments} -Psonatype-oss-release + + + + + + + + UTF-8 + https://oss.sonatype.org/content/repositories/snapshots/ + + + + + + sonatype-oss-release + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + + + diff --git a/xmvn-reactor b/xmvn-reactor new file mode 100644 index 0000000000000000000000000000000000000000..1777e9ca2cb2c7c8325dfb41a33f6ede570af9da --- /dev/null +++ b/xmvn-reactor @@ -0,0 +1,102 @@ + + + + + org.mybatis + mybatis + 3.5.8 + absolute-prefix/target/mybatis-3.5.8.jar + + jar + 1.6 + + + + org.slf4j + slf4j-api + 1.7.5 + true + + + log4j + log4j + 1.2.17 + true + + + org.apache.logging.log4j + log4j-core + 2.0.2 + true + + + commons-logging + commons-logging + 1.1.1 + true + + + org.javassist + javassist + 3.17.1-GA + true + + + cglib + cglib + 2.2.2 + true + + + + + org.mybatis + mybatis + pom + 3.5.8 + absolute-prefix/pom.xml + + jar + 1.6 + + + + org.slf4j + slf4j-api + 1.7.5 + true + + + log4j + log4j + 1.2.17 + true + + + org.apache.logging.log4j + log4j-core + 2.0.2 + true + + + commons-logging + commons-logging + 1.1.1 + true + + + org.javassist + javassist + 3.17.1-GA + true + + + cglib + cglib + 2.2.2 + true + + + + +