[mybatis] update to 3.2.8
gil
gil at fedoraproject.org
Fri Dec 26 14:10:58 UTC 2014
commit 1cf900a8d7ac84097953ff4a40dcbac7b4b99436
Author: gil <puntogil at libero.it>
Date: Fri Dec 26 15:10:42 2014 +0100
update to 3.2.8
.gitignore | 1 +
mybatis-3.2.2-commons-ognl.patch | 74 --------------------------------------
mybatis-3.2.8-commons-ognl.patch | 67 ++++++++++++++++++++++++++++++++++
mybatis.spec | 46 ++++++++---------------
sources | 2 +-
5 files changed, 85 insertions(+), 105 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7cdda0..3f002c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/mybatis-3.2.2.tar.gz
+/mybatis-3.2.8.tar.gz
diff --git a/mybatis-3.2.8-commons-ognl.patch b/mybatis-3.2.8-commons-ognl.patch
new file mode 100644
index 0000000..193828f
--- /dev/null
+++ b/mybatis-3.2.8-commons-ognl.patch
@@ -0,0 +1,67 @@
+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 @@
+
+ <dependencies>
+ <dependency>
+- <groupId>ognl</groupId>
+- <artifactId>ognl</artifactId>
+- <version>2.6.9</version>
++ <groupId>org.apache.commons</groupId>
++ <artifactId>commons-ognl</artifactId>
++ <version>4.0-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+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.spec b/mybatis.spec
index 05199b3..2f9a35d 100644
--- a/mybatis.spec
+++ b/mybatis.spec
@@ -1,6 +1,6 @@
Name: mybatis
-Version: 3.2.2
-Release: 7%{?dist}
+Version: 3.2.8
+Release: 1%{?dist}
Summary: SQL Mapping Framework for Java
License: ASL 2.0
# http://code.google.com/p/mybatis/
@@ -10,12 +10,11 @@ Source0: https://github.com/mybatis/mybatis-3/archive/%{name}-%{version}.t
# replace ognl ognl with apache-commons-ognl
Patch0: %{name}-%{version}-commons-ognl.patch
-BuildRequires: java-devel
-
BuildRequires: mvn(cglib:cglib)
BuildRequires: mvn(commons-logging:commons-logging)
-BuildRequires: mvn(log4j:log4j)
+BuildRequires: mvn(log4j:log4j:1.2.17)
BuildRequires: mvn(org.apache.commons:commons-ognl)
+BuildRequires: mvn(org.apache.logging.log4j:log4j-core)
BuildRequires: mvn(org.javassist:javassist)
BuildRequires: mvn(org.mybatis:mybatis-parent)
BuildRequires: mvn(org.slf4j:slf4j-api)
@@ -25,6 +24,7 @@ BuildRequires: maven-local
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-plugin-cobertura
+BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-provider-junit
# test deps
@@ -33,12 +33,8 @@ BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.derby:derby)
BuildRequires: geronimo-parent-poms
BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
-BuildRequires: mvn(org.apache.velocity:velocity) >= 1.7
-%if %{?fedora} <= 19
-BuildRequires: mvn(hsqldb:hsqldb)
-%else
-BuildRequires: mvn(org.hsqldb:hsqldb) >= 2.2.9
-%endif
+BuildRequires: mvn(org.apache.velocity:velocity)
+BuildRequires: mvn(org.hsqldb:hsqldb)
BuildRequires: mvn(org.mockito:mockito-core)
BuildRequires: mvn(postgresql:postgresql)
@@ -80,29 +76,16 @@ This package contains javadoc for %{name}.
%pom_remove_dep javax.transaction:transaction-api
%pom_add_dep org.apache.geronimo.specs:geronimo-jta_1.1_spec::test
-%if %{?fedora} <= 19
-# adapt for hsqldb 1.x
-%pom_remove_dep org.hsqldb:hsqldb
-%pom_add_dep hsqldb:hsqldb::test
-#rm -r src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
-sed -i 's/JDBCConnection/jdbcConnection/' src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
-sed -i 's/(JDBCConnection)/(jdbcConnection)/' src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
-# These tests fails for various reasons
-rm -r src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.java \
- src/test/java/org/apache/ibatis/submitted/awful_table/AwfulTableTest.java \
- src/test/java/org/apache/ibatis/submitted/sptests/SPTest.java \
- src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlTest.java \
- src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java \
- src/test/java/org/apache/ibatis/submitted/blobtest/BlobTest.java \
- src/test/java/org/apache/ibatis/submitted/multipleiterates/MultipleIteratesTest.java \
- src/test/java/org/apache/ibatis/submitted/foreach_map/ForEachMapTest.java \
- src/test/java/org/apache/ibatis/submitted/batch_keys/BatchKeysTest.java
-%endif
sed -i 's/\r//' LICENSE NOTICE
# Fails on java8
rm -r src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
+rm -r 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
+
%build
%mvn_file :%{name} %{name}
@@ -118,6 +101,9 @@ rm -r src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
%doc LICENSE NOTICE
%changelog
+* Wed Dec 24 2014 gil cattaneo <puntogil at libero.it> 3.2.8-1
+- update to 3.2.8
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -142,4 +128,4 @@ rm -r src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
- update to 3.2.2
* Fri Apr 20 2012 gil cattaneo <puntogil at libero.it> 3.1.1-1
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index bbdf2fd..3dee20b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d710b5720ecec8dd39ff04e8ff5c216 mybatis-3.2.2.tar.gz
+85d2e294be087307ab0cd13c60fcaf7f mybatis-3.2.8.tar.gz
More information about the scm-commits
mailing list