[jacoco] Update to upstream 0.5.10 release.
Krzysztof Daniel
kdaniel at fedoraproject.org
Tue Sep 11 13:15:58 UTC 2012
commit df1c001a5bb7b0ce8d2d63a87a1078b15c7c10eb
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Sep 11 14:43:32 2012 +0200
Update to upstream 0.5.10 release.
.gitignore | 6 +++
jacoco-remove-reporting.patch | 28 +++++++++++++
jacoco.spec | 31 ++++++++-------
...Dependency.patch => removeGroovyScripting.patch | 41 +------------------
sources | 2 +-
5 files changed, 55 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec147a6..7b9e349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,8 @@
/eclemma-v0.5.7.tar.gz
/.project
+/jacoco-0.5.7-0.5.fc18-fedora-devel-x86_64
+/noarch
+/v0.5.7
+/eclemma-v0.5.9.tar.gz
+/v0.5.9
+/jacoco-jacoco-v0.5.10-0-gd3dd13c.tar.gz
diff --git a/jacoco-remove-reporting.patch b/jacoco-remove-reporting.patch
new file mode 100644
index 0000000..704b0fa
--- /dev/null
+++ b/jacoco-remove-reporting.patch
@@ -0,0 +1,28 @@
+--- jacoco-maven-plugin/pom.xml.bak 2012-07-30 09:28:25.000000000 +0200
++++ jacoco-maven-plugin/pom.xml 2012-09-11 13:14:55.853344416 +0200
+@@ -90,25 +90,6 @@
+ </tagletArtifacts>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-plugin-plugin</artifactId>
+- <executions>
+- <execution>
+- <id>help-mojo</id>
+- <goals>
+- <goal>helpmojo</goal>
+- </goals>
+- </execution>
+- <execution>
+- <id>report</id>
+- <phase>package</phase>
+- <goals>
+- <goal>report</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+ </plugins>
+ </build>
+ </project>
diff --git a/jacoco.spec b/jacoco.spec
index dc4c7ac..1d60e1a 100644
--- a/jacoco.spec
+++ b/jacoco.spec
@@ -1,15 +1,20 @@
-%global tag 201204190339
+%global tag 201208310627
Name: jacoco
-Version: 0.5.7
-Release: 0.6%{?dist}
+Version: 0.5.10
+Release: 1%{?dist}
Summary: Java Code Coverage for Eclipse
Group: System Environment/Libraries
License: EPL
URL: http://www.eclemma.org/jacoco/
-#http://eclemma.svn.sourceforge.net/viewvc/eclemma/jacoco/tags/v0.5.7/?view=tar
-Source0: eclemma-v0.5.7.tar.gz
-Patch0: removeGroovyScriptingAndCircularDependency.patch
+#https://github.com/jacoco/jacoco/tags
+Source0: jacoco-jacoco-v0.5.10-0-gd3dd13c.tar.gz
+Patch0: removeGroovyScripting.patch
+
+#jacoco can't be build with maven 3. https://github.com/jacoco/jacoco/issues/21
+# probably due to
+# http://maven.apache.org/plugins/maven-site-plugin/maven-3.html#New_Configuration_Maven_3_only_no_reports_configuration_inheritance
+Patch1: jacoco-remove-reporting.patch
BuildArch: noarch
@@ -56,8 +61,9 @@ Requires: %{name} = %{version}-%{release}
A Jacoco plugin for maven.
%prep
-%setup -q -n v%{version}
+%setup -q -n jacoco-jacoco-a619221
%patch0 -p3
+%patch1
# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
@@ -74,13 +80,7 @@ fi
%build
# Note: Tests must be disabled because they introduce circular dependency
# right now.
-OPTIONS=" -DrandomNumner=${RANDOM} -Dmaven.test.skip=true clean install javadoc:aggregate"
-
-# Ensure that all required dependencies are available in a local p2 repo
-/bin/sh -x %{_eclipse_base}/buildscripts/copy-platform SDK %{_eclipse_base}
-
-eclipse -debug -consolelog -nosplash -verbose -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -me\
-tadataRepository file:$PWD/myrepo -artifactRepository file:$PWD/myrepo -source $PWD/SDK -compress -append -publishArtifacts
+OPTIONS="-DrandomNumner=${RANDOM} clean package javadoc:aggregate"
pushd org.jacoco.build
mvn-rpmbuild $OPTIONS
@@ -147,6 +147,9 @@ cp -rf org.jacoco.build/target/site/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}/
%changelog
+* Tue Sep 11 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.5.9-1
+- Update to upstream 0.5.10 release.
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.7-0.6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/removeGroovyScriptingAndCircularDependency.patch b/removeGroovyScripting.patch
similarity index 82%
rename from removeGroovyScriptingAndCircularDependency.patch
rename to removeGroovyScripting.patch
index 24cfd75..d782fab 100644
--- a/removeGroovyScriptingAndCircularDependency.patch
+++ b/removeGroovyScripting.patch
@@ -47,9 +47,9 @@ index 3a91996..c236fc4 100644
</modules>
<scm>
-@@ -399,12 +399,6 @@
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
+@@ -410,12 +399,6 @@
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0</version>
</plugin>
- <!-- Third-party plugins -->
- <plugin>
@@ -76,27 +76,6 @@ index 3a91996..c236fc4 100644
</target>
</configuration>
</execution>
-@@ -795,13 +789,13 @@
- <exists>${basedir}</exists>
- </file>
- </activation>
-- <repositories>
-- <repository>
-- <id>jacoco-thirdparty</id>
-- <layout>p2</layout>
-- <url>http://download.eclipse.org/releases/helios</url>
-- </repository>
-- </repositories>
-+ <repositories>
-+ <repository>
-+ <id>fedora-rpmbuild</id>
-+ <url>file:../myrepo</url>
-+ <layout>p2</layout>
-+ </repository>
-+ </repositories>
- </profile>
- </profiles>
- </project>
diff --git a/jacoco/v0.5.7/org.jacoco.core/pom.xml b/jacoco/v0.5.7/org.jacoco.core/pom.xml
index 251ee00..332a000 100644
--- a/jacoco/v0.5.7/org.jacoco.core/pom.xml
@@ -175,17 +154,3 @@ index 3321cdd..7ea6612 100644
</executions>
<dependencies>
<dependency>
---- a/jacoco/v0.5.7/jacoco-maven-plugin/pom.xml.bak 2012-05-04 12:20:03.000000000 +0200
-+++ a/jacoco/v0.5.7/jacoco-maven-plugin/pom.xml 2012-05-07 16:20:31.191389081 +0200
-@@ -49,11 +49,6 @@
-
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
-- <artifactId>maven-reporting-api</artifactId>
-- <version>${project.prerequisites.maven}</version>
-- </dependency>
-- <dependency>
-- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>2.1</version>
- </dependency>
diff --git a/sources b/sources
index d5ae7de..459b4ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68a584853f45710f65b66fbaa46070ab eclemma-v0.5.7.tar.gz
+f4a7df31d83fc9c0e1992003e15dc864 jacoco-jacoco-v0.5.10-0-gd3dd13c.tar.gz
More information about the scm-commits
mailing list