[jacoco] Update to latest upstream (6.2.0).
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed May 8 10:34:05 UTC 2013
commit a2017d49bb9f923f8f9467d7b1af37771344b869
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed May 8 09:38:58 2013 +0200
Update to latest upstream (6.2.0).
.gitignore | 2 +
jacoco-remove-reporting.patch | 28 -------
jacoco.spec | 31 ++++----
removeGroovyScripting.patch | 156 +++++------------------------------------
sources | 2 +-
5 files changed, 38 insertions(+), 181 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf81f87..1caad4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
/jacoco-jacoco-v0.5.10-0-gd3dd13c.tar.gz
/jacoco-0.6.0.tar.gz
/jacoco-0.6.0
+/v0.6.2.tar.gz
+/jacoco-0.6.2
diff --git a/jacoco.spec b/jacoco.spec
index eb8de88..ee39c2f 100644
--- a/jacoco.spec
+++ b/jacoco.spec
@@ -1,20 +1,15 @@
-%global tag 201210061924
+%global tag 201302030002
Name: jacoco
-Version: 0.6.0
-Release: 4%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
Summary: Java Code Coverage for Eclipse
Group: System Environment/Libraries
License: EPL
URL: http://www.eclemma.org/jacoco/
-#https://github.com/jacoco/jacoco/archive/v0.6.0.tar.gz
-Source0: https://github.com/jacoco/jacoco/archive/jacoco-0.6.0.tar.gz
-Patch0: removeGroovyScripting.patch
+Source0: https://github.com/jacoco/jacoco/archive/v%{version}.tar.gz
-#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
+Patch0: removeGroovyScripting.patch
BuildArch: noarch
@@ -64,11 +59,14 @@ A Jacoco plugin for maven.
%prep
%setup -q
-%patch0 -p3
-%patch1
+%patch0
-sed -i -e "s|0.13.0|0.16.0|g" org.jacoco.build/pom.xml
-sed -i -e "s|4.1.0|5.0.0|g" org.jacoco.core/META-INF/MANIFEST.MF org.jacoco.report/META-INF/MANIFEST.MF
+%pom_disable_module ../org.jacoco.examples org.jacoco.build
+%pom_disable_module ../org.jacoco.doc org.jacoco.build
+%pom_disable_module ../org.jacoco.tests org.jacoco.build
+%pom_disable_module ../jacoco org.jacoco.build
+
+#%pom_remove_plugin org.apache.maven.plugins:maven-shade-plugin org.jacoco.agent.rt/pom.xml
# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
@@ -85,7 +83,7 @@ fi
%build
# Note: Tests must be disabled because they introduce circular dependency
# right now.
-OPTIONS="-DrandomNumber=${RANDOM} -DskipTychoVersionCheck clean package javadoc:aggregate"
+OPTIONS="-DrandomNumber=${RANDOM} -DskipTychoVersionCheck package javadoc:aggregate"
mvn-rpmbuild $OPTIONS
@@ -151,6 +149,9 @@ cp -rf target/site/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}/
%changelog
+* Wed May 8 2013 Krzysztof Daniel <kdaniel at redhat.com> 0.6.2-1
+- Update to latest upstream.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/removeGroovyScripting.patch b/removeGroovyScripting.patch
index d782fab..e53eb85 100644
--- a/removeGroovyScripting.patch
+++ b/removeGroovyScripting.patch
@@ -1,95 +1,16 @@
-diff --git a/jacoco/v0.5.7/org.jacoco.agent.rt/pom.xml b/jacoco/v0.5.7/org.jacoco.agent.rt/pom.xml
-index 089f488..dd994a4 100644
---- a/jacoco/v0.5.7/org.jacoco.agent.rt/pom.xml
-+++ b/jacoco/v0.5.7/org.jacoco.agent.rt/pom.xml
-@@ -44,19 +44,19 @@
- <plugins>
- <!-- Generates random number for relocation of packages -->
- <plugin>
-- <groupId>org.codehaus.groovy.maven</groupId>
-- <artifactId>gmaven-plugin</artifactId>
-+ <!-- groupId>org.codehaus.groovy.maven</groupId-->
-+ <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
-- <goal>execute</goal>
-+ <goal>run</goal>
- </goals>
- <configuration>
-- <source>
-- def id = Math.abs(new java.util.Random().nextInt())
-- project.properties['rt'] = "rt_" + Integer.toString(id, Character.MAX_RADIX)
-- </source>
-+ <tasks>
-+ <property name="rt" value="rt_${randomNumber}" />
-+ </tasks>
-+ <exportAntProperties>true</exportAntProperties>
- </configuration>
- </execution>
- </executions>
-diff --git a/jacoco/v0.5.7/org.jacoco.build/pom.xml b/jacoco/v0.5.7/org.jacoco.build/pom.xml
-index 3a91996..c236fc4 100644
---- a/jacoco/v0.5.7/org.jacoco.build/pom.xml
-+++ b/jacoco/v0.5.7/org.jacoco.build/pom.xml
-@@ -88,10 +88,10 @@
-
- <module>../jacoco-maven-plugin</module>
+--- org.jacoco.build/pom.xml.orig 2013-05-07 14:05:42.250540783 +0200
++++ org.jacoco.build/pom.xml 2013-05-07 14:35:21.511548698 +0200
+@@ -548,28 +547,20 @@
+ </plugin>
-- <module>../org.jacoco.tests</module>
-+ <!-- module>../org.jacoco.tests</module -->
-
-- <module>../org.jacoco.examples</module>
-- <module>../org.jacoco.doc</module>
-+ <!-- module>../org.jacoco.examples</module -->
-+ <!-- module>../org.jacoco.doc</module -->
- </modules>
-
- <scm>
-@@ -410,12 +399,6 @@
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0</version>
- </plugin>
-- <!-- Third-party plugins -->
-- <plugin>
-- <groupId>org.codehaus.groovy.maven</groupId>
-- <artifactId>gmaven-plugin</artifactId>
-- <version>1.0</version>
-- </plugin>
- </plugins>
- </pluginManagement>
-
-@@ -555,13 +549,13 @@
- </not>
- </fileset>
- <pathconvert property="missing" refid="missinglicense.fileset"/>
-- <fail message="Invalid license info in: ${missing}">
-+ <!--fail message="Invalid license info in: ${missing}">
- <condition>
- <not>
- <equals arg1="${missing}" arg2=""/>
- </not>
- </condition>
-- </fail>
-+ </fail-->
- </target>
- </configuration>
- </execution>
-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
-+++ b/jacoco/v0.5.7/org.jacoco.core/pom.xml
-@@ -44,18 +44,19 @@
- <!-- We can't define qualified.bundle.version as a project property, because buildQualifier constructed after reading POM by tycho-packaging-plugin -->
- <!-- but we need it for resource filtering in compliance with Ant build, so here is workaround -->
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
-+ <!-- groupId>org.codehaus.groovy.maven</groupId -->
++ <!--groupId>org.codehaus.groovy.maven</groupId-->
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>parse-version</id>
<phase>validate</phase>
<goals>
- <goal>execute</goal>
@@ -97,60 +18,21 @@ index 251ee00..332a000 100644
</goals>
<configuration>
- <source>
-- project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'] + '.' + project.properties['buildQualifier']
+- major = project.properties['parsedVersion.majorVersion']
+- minor = project.properties['parsedVersion.minorVersion']
+- incremental = project.properties['parsedVersion.incrementalVersion']
+- qualifier = "${maven.build.timestamp}"
+- project.properties['buildQualifier'] = qualifier
+- project.properties['unqualifiedVersion'] = major + '.' + minor + '.' + incremental
+- project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'] + '.' + project.properties['buildQualifier']
+- project.properties['build.date'] = qualifier.substring(0, 4) + '/' + qualifier.substring(4, 6) + '/' + qualifier.substring(6, 8)
+- buildNumber = project.properties['buildNumber']
+- project.properties['jacoco.runtime.package.name'] = "org.jacoco.agent.rt.internal_" + buildNumber.substring(buildNumber.length() - 7, buildNumber.length())
- </source>
-+ <tasks>
-+ <!-- project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'] + '.' + project.properties['buildQualifier'] -->
++ <tasks>
++ <property name="jacoco.runtime.package.name" value="org.jacoco.agent.rt.internal_${randomNumber}" />
+ </tasks>
-+ <exportAntProperties>true</exportAntProperties>
- </configuration>
- </execution>
- </executions>
-diff --git a/jacoco/v0.5.7/org.jacoco.doc/pom.xml b/jacoco/v0.5.7/org.jacoco.doc/pom.xml
-index 3321cdd..7ea6612 100644
---- a/jacoco/v0.5.7/org.jacoco.doc/pom.xml
-+++ b/jacoco/v0.5.7/org.jacoco.doc/pom.xml
-@@ -72,24 +72,6 @@
-
- <plugins>
- <plugin>
-- <groupId>org.codehaus.groovy.maven</groupId>
-- <artifactId>gmaven-plugin</artifactId>
-- <executions>
-- <execution>
-- <phase>validate</phase>
-- <goals>
-- <goal>execute</goal>
-- </goals>
-- <configuration>
-- <source>
-- project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'] + '.' + project.properties['buildQualifier']
-- </source>
-- </configuration>
-- </execution>
-- </executions>
-- </plugin>
--
-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-@@ -188,6 +170,18 @@
- </target>
++ <exportAntProperties>true</exportAntProperties>
</configuration>
</execution>
-+ <execution>
-+ <phase>validate</phase>
-+ <goals>
-+ <goal>run</goal>
-+ </goals>
-+ <configuration>
-+ <tasks>
-+ <property name="version" value="${project.properties.unqualifiedVersion}.${project.properties.buildQualifier}"/>
-+ </tasks>
-+ <exportAntProperties>true</exportAntProperties>
-+ </configuration>
-+ </execution>
</executions>
- <dependencies>
- <dependency>
diff --git a/sources b/sources
index 03171a1..5a8abaa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b423f66b8dd9b06013afd722b3bccf8 jacoco-0.6.0.tar.gz
+971310fed29828ff52d7169c89dd9eae v0.6.2.tar.gz
More information about the scm-commits
mailing list