commit 9535db90ab2ef61c93af7ba50f5e1d627ed360a0
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Sep 2 10:09:17 2013 +0200
Update to upstream version 2.6
- Enable tests
- Drop group tag
.gitignore | 1 +
cobertura-maven-plugin.spec | 47 +++++++++++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 36 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a4dbdcb..869c5e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cobertura-maven-plugin-2.5.2-source-release.zip
/LICENSE-2.0.txt
+/cobertura-maven-plugin-2.6-source-release.zip
diff --git a/cobertura-maven-plugin.spec b/cobertura-maven-plugin.spec
index 3ce3600..6c6b5aa 100644
--- a/cobertura-maven-plugin.spec
+++ b/cobertura-maven-plugin.spec
@@ -1,6 +1,6 @@
Name: cobertura-maven-plugin
-Version: 2.5.2
-Release: 4%{?dist}
+Version: 2.6
+Release: 1%{?dist}
Summary: Plugin providing the features of Cobertura within Maven
Group: Development/Libraries
@@ -14,15 +14,24 @@ Source1:
http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
BuildRequires: maven-local
-BuildRequires: jpackage-utils
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-invoker-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: gnu-getopt >= 0:1.0.13
-BuildRequires: cobertura
-BuildRequires: mojo-parent
+BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(httpunit:httpunit)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(net.sourceforge.cobertura:cobertura)
+BuildRequires: mvn(net.sourceforge.cobertura:cobertura-runtime)
+BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
+BuildRequires: mvn(org.apache.maven.shared:maven-invoker)
+BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.codehaus.mojo:mojo-parent)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(urbanophile:java-getopt)
Provides: maven-plugin-cobertura = %{version}-%{release}
Obsoletes: maven-plugin-cobertura < 2.5.2-1
@@ -36,7 +45,6 @@ which parts of your Java program are lacking test coverage.
%package javadoc
Summary: Javadoc for %{name}
-Group: Documentation
%description javadoc
This package contains the API documentation for %{name}.
@@ -51,9 +59,17 @@ cp %{SOURCE1} LICENSE
# remove bundled .class files
find . -name *.class -delete
+# these tests fail (NoClassDefFoundError: net.sf.cglib.proxy.CallbackFilter)
+rm -f src/test/java/org/codehaus/mojo/cobertura/CoberturaInstrumentMojoTest.java
+rm -f src/test/java/org/codehaus/mojo/cobertura/CoberturaReportMojoTest.java
+
+# following integration tests need cobertura 2.0 to work
+rm -Rf src/it/mcobertura-176
+rm -Rf src/it/mcobertura-65
+
%build
# tests are disabled because of missing dependencies
-%mvn_build -f
+%mvn_build
%install
%mvn_install
@@ -65,6 +81,11 @@ find . -name *.class -delete
%doc LICENSE
%changelog
+* Mon Sep 02 2013 Michal Srb <msrb(a)redhat.com> - 2.6-1
+- Update to upstream version 2.6
+- Enable tests
+- Drop group tag
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.5.2-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index bb3bb8a..941ea3b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f5264caa65502578d2e58846a4665536 cobertura-maven-plugin-2.5.2-source-release.zip
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
+0b19f5019bd38ea228a917335f45bc9d cobertura-maven-plugin-2.6-source-release.zip