[jacoco] 03/04: Build the agent (Closes: #856996)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jacoco.

commit bcda3c4d345decaeaa2a36b69ca5b056c0332069
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 12 01:52:07 2017 +0200

    Build the agent (Closes: #856996)
---
 debian/changelog                                 |  1 +
 debian/control                                   |  5 ++-
 debian/libjacoco-java.poms                       |  3 ++
 debian/maven.ignoreRules                         |  1 -
 debian/patches/gmaven-plugin-compatibility.patch | 57 ++++++++++++++++++++++++
 debian/patches/ignore_modules.patch              | 11 ++---
 debian/patches/series                            |  1 +
 7 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06faf8d..328dab8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jacoco (0.7.8-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build the agent (Closes: #856996)
   * Ignore maven-enforcer-plugin
   * Standards-Version updated to 4.1.0
 
diff --git a/debian/control b/debian/control
index 7ae2568..a12123f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,16 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Kai-Chung Yan <seamlikok at gmail.com>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: ant,
+               debhelper (>= 10~),
                default-jdk-doc,
                javahelper,
                libasm-java,
                libbuild-helper-maven-plugin-java,
+               libgmavenplus-java,
                libmaven-antrun-plugin-java,
                libmaven-assembly-plugin-java,
+               libmaven-dependency-plugin-java,
                libmaven-invoker-plugin-java,
                libmaven-javadoc-plugin-java,
                libmaven-shade-plugin-java,
diff --git a/debian/libjacoco-java.poms b/debian/libjacoco-java.poms
index 8354c90..f246f55 100644
--- a/debian/libjacoco-java.poms
+++ b/debian/libjacoco-java.poms
@@ -1,4 +1,7 @@
 org.jacoco.build/pom.xml --ignore-pom
 org.jacoco.core/pom.xml --java-lib
 org.jacoco.report/pom.xml --java-lib
+org.jacoco.agent.rt/pom.xml --java-lib
+org.jacoco.agent/pom.xml --java-lib
 pom.xml --ignore-pom
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 7dac38b..d0c3539 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,3 +1,2 @@
 org.apache.maven.plugins maven-enforcer-plugin * * * *
-org.codehaus.groovy.maven gmaven-plugin * * * *
 org.codehaus.mojo buildnumber-maven-plugin * * * *
diff --git a/debian/patches/gmaven-plugin-compatibility.patch b/debian/patches/gmaven-plugin-compatibility.patch
new file mode 100644
index 0000000..3ac2762
--- /dev/null
+++ b/debian/patches/gmaven-plugin-compatibility.patch
@@ -0,0 +1,57 @@
+Description: Use gmaven-plus instead of gmaven
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/org.jacoco.build/pom.xml
++++ b/org.jacoco.build/pom.xml
+@@ -145,6 +145,8 @@
+     <!-- See http://jira.codehaus.org/browse/SONAR-2096 -->
+     <sonar.java.source>1.5</sonar.java.source>
+     <sonar.java.target>1.5</sonar.java.target>
++
++    <buildNumber>00000000</buildNumber>
+   </properties>
+ 
+   <dependencyManagement>
+@@ -563,8 +565,9 @@
+       </plugin>
+ 
+       <plugin>
+-        <groupId>org.codehaus.groovy.maven</groupId>
+-        <artifactId>gmaven-plugin</artifactId>
++        <groupId>org.codehaus.gmavenplus</groupId>
++        <artifactId>gmavenplus-plugin</artifactId>
++        <version>1.5</version>
+         <executions>
+           <execution>
+             <id>parse-version</id>
+@@ -573,7 +576,8 @@
+               <goal>execute</goal>
+             </goals>
+             <configuration>
+-              <source>
++              <scripts>
++                <script>
+                 major = project.properties['parsedVersion.majorVersion']
+                 minor = project.properties['parsedVersion.minorVersion']
+                 incremental = project.properties['parsedVersion.incrementalVersion']
+@@ -584,10 +588,19 @@
+                 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>
++                </script>
++              </scripts>
+             </configuration>
+           </execution>
+         </executions>
++        <dependencies>
++          <dependency>
++            <groupId>org.codehaus.groovy</groupId>
++            <artifactId>groovy-all</artifactId>
++            <version>debian</version>
++            <scope>runtime</scope>
++          </dependency>
++        </dependencies>
+       </plugin>
+     </plugins>
+   </build>
diff --git a/debian/patches/ignore_modules.patch b/debian/patches/ignore_modules.patch
index 99d971b..f8ad739 100644
--- a/debian/patches/ignore_modules.patch
+++ b/debian/patches/ignore_modules.patch
@@ -5,13 +5,10 @@ Description: maven-debian-helper fails to ignore modules
  maven-debin-helper fails to ignore it. Hence we have to use a patch to do it.
 --- a/org.jacoco.build/pom.xml
 +++ b/org.jacoco.build/pom.xml
-@@ -91,17 +91,6 @@
-     <!-- Order is important: org.jacoco.agent.rt embeds into org.jacoco.agent and JaCoCo Agent used during tests -->
-     <module>../org.jacoco.core</module>
-     <module>../org.jacoco.report</module>
--    <module>../org.jacoco.agent.rt</module>
--    <module>../org.jacoco.agent</module>
--    <module>../org.jacoco.ant</module>
+@@ -94,14 +94,6 @@
+     <module>../org.jacoco.agent.rt</module>
+     <module>../org.jacoco.agent</module>
+     <module>../org.jacoco.ant</module>
 -
 -    <module>../jacoco-maven-plugin</module>
 -
diff --git a/debian/patches/series b/debian/patches/series
index 651859b..bff142a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 org.jacoco.core.internal.flow.LabelFlowAnalyzer_tryCatchBlocks.patch
 ignore_modules.patch
+gmaven-plugin-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jacoco.git