diff --git a/mybatis-generator-1.3.2.tar.gz b/mybatis-generator-1.3.2.tar.gz deleted file mode 100644 index db4c971..0000000 Binary files a/mybatis-generator-1.3.2.tar.gz and /dev/null differ diff --git a/mybatis-generator-1.4.1.tar.gz b/mybatis-generator-1.4.1.tar.gz new file mode 100644 index 0000000..24943ac Binary files /dev/null and b/mybatis-generator-1.4.1.tar.gz differ diff --git a/mybatis-generator.spec b/mybatis-generator.spec index 61330a0..a2b5b84 100644 --- a/mybatis-generator.spec +++ b/mybatis-generator.spec @@ -1,8 +1,8 @@ Name: mybatis-generator -Version: 1.3.2 +Version: 1.4.1 Release: 1 Summary: A code generator for MyBatis and iBATIS -License: ASL 2.0 +License: Apache-2.0 URL: http://www.mybatis.org/ Source0: https://github.com/mybatis/generator/archive/%{name}-%{version}.tar.gz BuildRequires: mvn(log4j:log4j:1.2.17) mvn(org.apache.ant:ant) @@ -15,6 +15,10 @@ BuildRequires: mvn(org.apache.commons:commons-ognl) BuildRequires: maven-local maven-enforcer-plugin maven-plugin-bundle BuildRequires: maven-plugin-plugin maven-surefire-report-plugin BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.logging.log4j:log4j-api) +BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) +BuildRequires: mvn(org.reflections:reflections) +BuildRequires: mvn(org.hsqldb:hsqldb) BuildArch: noarch %description @@ -47,32 +51,23 @@ This package contains javadoc for %{name}. %prep %setup -q -n generator-%{name}-%{version} -%pom_remove_dep :cobertura -%pom_remove_dep :cobertura mybatis-generator-systests-mybatis3 -%pom_xpath_remove "pom:dependency[pom:artifactId= '%{name}-core']/pom:classifier" %{name}-systests-mybatis3 +mv core/* ./ +rm -rf eclipse +rm -rf core +sed -i 's/test/compile/g' %{name}-systests-mybatis3/pom.xml -%pom_remove_dep :cobertura mybatis-generator-systests-ibatis2-java2 -%pom_xpath_remove "pom:dependency[pom:artifactId= '%{name}-core']/pom:classifier" %{name}-systests-ibatis2-java2 -%pom_remove_dep :cobertura mybatis-generator-systests-ibatis2-java5 -%pom_xpath_remove "pom:dependency[pom:artifactId= '%{name}-core']/pom:classifier" %{name}-systests-ibatis2-java5 - -%pom_disable_module %{name}-systests-ibatis2-java2 -%pom_disable_module %{name}-systests-ibatis2-java5 -%pom_remove_dep :ibatis-sqlmap +%pom_disable_module %{name}-systests-mybatis3-java8 +%pom_disable_module %{name}-systests-kotlin +%pom_disable_module %{name}-systests-domtests %pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :maven-gcu-plugin %{name}-core -%pom_remove_plugin :jdepend-maven-plugin %{name}-core -%pom_remove_plugin :maven-install-plugin %{name}-core %pom_remove_plugin :maven-assembly-plugin %{name}-core %pom_remove_plugin :maven-javadoc-plugin %{name}-core -%pom_remove_plugin :maven-release-plugin %{name}-core %pom_remove_plugin :maven-site-plugin %{name}-core %pom_remove_plugin :maven-source-plugin %{name}-core -%pom_remove_plugin :cobertura-maven-plugin %{name}-core -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" %{name}-core - %pom_add_dep org.apache.commons:commons-ognl::test mybatis-generator-systests-mybatis3 +%pom_remove_plugin :kotlin-maven-plugin %{name}-core +%pom_remove_plugin :kotlin-maven-plugin sed -i 's/\r//' LICENSE NOTICE %{name}-core/doc/* @@ -103,5 +98,8 @@ sed -i 's/\r//' LICENSE NOTICE %{name}-core/doc/* %license LICENSE NOTICE %changelog +* Thu Jun 30 2022 Ge Wang - 1.4.1-1 +- Upgrade to version 1.4.1 + * Mon May 10 2021 chengzihan - 1.3.2-1 - Package init