diff options
| author | Mirko Friedenhagen <mfriedenhagen@gmail.com> | 2013-12-22 21:03:03 +0100 |
|---|---|---|
| committer | Mirko Friedenhagen <mfriedenhagen@gmail.com> | 2013-12-22 21:03:03 +0100 |
| commit | 78f2d42aa6b33a607e1d0f25391324cb9b06a5d5 (patch) | |
| tree | 8e2bb551849e5e86e29d80bc683d917dcfed0c74 /org.jacoco.doc | |
| parent | ada287818cc82e359dfdae77a3bb45a82ecee533 (diff) | |
| parent | 8426630ead77abfa3c110581dea4d43dda331430 (diff) | |
| download | jacoco-78f2d42aa6b33a607e1d0f25391324cb9b06a5d5.tar.gz | |
Merge origin/master
Diffstat (limited to 'org.jacoco.doc')
| -rw-r--r-- | org.jacoco.doc/docroot/doc/changes.html | 1 | ||||
| -rw-r--r-- | org.jacoco.doc/pom.xml | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html index f55894ba..77642479 100644 --- a/org.jacoco.doc/docroot/doc/changes.html +++ b/org.jacoco.doc/docroot/doc/changes.html @@ -24,6 +24,7 @@ <ul> <li>Skip jacoco instrumentation for mvn modules with package type ear (GitHub <a href="https://github.com/jacoco/jacoco/issues/169">#169</a>).</li> <li>Align skip conditions and messages and give reasons (GitHub <a href="https://github.com/jacoco/jacoco/issues/171">#171</a>).</li> + <li>Restrict visibility of methods in abstract classes of jacoco-maven-plugin (GitHub <a href="https://github.com/jacoco/jacoco/issues/175">#175</a>).</li> </ul> <h2>Release 0.6.4 (2013/12/10)</h2> diff --git a/org.jacoco.doc/pom.xml b/org.jacoco.doc/pom.xml index 720f18ae..9716ec65 100644 --- a/org.jacoco.doc/pom.xml +++ b/org.jacoco.doc/pom.xml @@ -93,6 +93,7 @@ <fileset dir="../org.jacoco.agent.rt.test/target" includes="jacoco.exec"/> <fileset dir="../org.jacoco.ant.test/target" includes="jacoco.exec"/> <fileset dir="../org.jacoco.core.test/target" includes="jacoco.exec"/> + <fileset dir="../org.jacoco.examples.test/target" includes="jacoco.exec"/> <fileset dir="../org.jacoco.report.test/target" includes="jacoco.exec"/> <fileset dir="../jacoco-maven-plugin.test/target" includes="jacoco.exec"/> </executiondata> @@ -130,6 +131,14 @@ <fileset dir="../org.jacoco.core/src"/> </sourcefiles> </group> + <group name="org.jacoco.examples"> + <classfiles> + <fileset dir="../org.jacoco.examples/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="../org.jacoco.examples/src"/> + </sourcefiles> + </group> <group name="org.jacoco.report"> <classfiles> <fileset dir="../org.jacoco.report/target/classes"/> @@ -162,6 +171,7 @@ <fileset dir="../org.jacoco.ant.test/target" includes="surefire-reports/**/*.xml"/> <fileset dir="../org.jacoco.core.test/target" includes="surefire-reports/**/*.xml"/> <fileset dir="../org.jacoco.report.test/target" includes="surefire-reports/**/*.xml"/> + <fileset dir="../org.jacoco.examples.test/target" includes="surefire-reports/**/*.xml"/> <report format="noframes" styledir="xsl" todir="${project.build.directory}/junit"> <param name="qualified.bundle.version" expression="${qualified.bundle.version}"/> <param name="jacoco.home.url" expression="${jacoco.home.url}"/> |