gil pushed to mybatis-generator (master). "remove unavailable cobertura and changes plugin"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 1 12:59:11 UTC 2015


>From 9f933d5f1d51bbfba662f59ad1fa083db5f646de Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Wed, 1 Apr 2015 14:58:58 +0200
Subject: remove unavailable cobertura and changes plugin


diff --git a/mybatis-generator.spec b/mybatis-generator.spec
index 69792a9..7183e29 100644
--- a/mybatis-generator.spec
+++ b/mybatis-generator.spec
@@ -1,6 +1,6 @@
 Name:          mybatis-generator
 Version:       1.3.2
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       A code generator for MyBatis and iBATIS
 License:       ASL 2.0
 URL:           http://www.mybatis.org/
@@ -17,16 +17,12 @@ BuildRequires: mvn(junit:junit)
 BuildRequires: mvn(org.apache.commons:commons-ognl)
 BuildRequires: mvn(org.hsqldb:hsqldb)
 
-BuildRequires: mvn(net.sourceforge.cobertura:cobertura)
 
 BuildRequires: maven-local
-BuildRequires: maven-changes-plugin
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-surefire-report-plugin
-# required by changes-plugin
-BuildRequires: mvn(org.apache.xmlrpc:xmlrpc-client)
 
 BuildArch:     noarch
 
@@ -60,6 +56,16 @@ 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
+
+%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
+
+
 # Unavailable deps org.apache.ibatis:ibatis-sqlmap:2.3.4.726
 %pom_disable_module %{name}-systests-ibatis2-java2
 %pom_disable_module %{name}-systests-ibatis2-java5
@@ -80,12 +86,12 @@ This package contains javadoc for %{name}.
 %pom_remove_plugin :maven-source-plugin %{name}-core
 # Disable cobertura plugin
 %pom_remove_plugin :cobertura-maven-plugin %{name}-core
-%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" %{name}-core
-%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='mybatis-generator-maven-plugin']/pom:dependencies/pom:dependency[pom:artifactId='mybatis-generator-core']/pom:classifier" %{name}-systests-mybatis3
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" %{name}-core
 
 # java.lang.NoClassDefFoundError: org/apache/commons/ognl/PropertyAccessor
 %pom_add_dep org.apache.commons:commons-ognl::test mybatis-generator-systests-mybatis3
 
+
 sed -i 's/\r//' LICENSE NOTICE %{name}-core/doc/*
 
 %mvn_package ":%{name}" %{name}
@@ -115,6 +121,9 @@ sed -i 's/\r//' LICENSE NOTICE %{name}-core/doc/*
 %license LICENSE NOTICE
 
 %changelog
+* Wed Apr 01 2015 gil cattaneo <puntogil at libero.it> 1.3.2-6
+- remove unavailable cobertura and changes plugin
+
 * Tue Feb 10 2015 gil cattaneo <puntogil at libero.it> 1.3.2-5
 - introduce license macro
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mybatis-generator.git/commit/?h=master&id=9f933d5f1d51bbfba662f59ad1fa083db5f646de


More information about the scm-commits mailing list