You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/12/26 09:48:25 UTC
svn commit: r1849746 - in /webservices/axiom/branches/1.2.x: ./
code-coverage/ pom.xml src/site/site.xml
Author: veithen
Date: Wed Dec 26 09:48:25 2018
New Revision: 1849746
URL: http://svn.apache.org/viewvc?rev=1849746&view=rev
Log:
Merge r1849743 to the 1.2 branch.
Removed:
webservices/axiom/branches/1.2.x/code-coverage/
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/pom.xml
webservices/axiom/branches/1.2.x/src/site/site.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 26 09:48:25 2018
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1849746&r1=1849745&r2=1849746&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Wed Dec 26 09:48:25 2018
@@ -219,7 +219,6 @@
<module>userguide</module>
<module>apidocs</module>
<module>distribution</module>
- <module>code-coverage</module>
<module>testing</module>
<module>aspects</module>
<module>implementations</module>
@@ -972,7 +971,7 @@
</configuration>
</execution>
<execution>
- <id>check-jacoco-exec</id>
+ <id>check-tmp-dir</id>
<phase>verify</phase>
<goals>
<goal>execute</goal>
@@ -985,10 +984,6 @@
if (new File(project.build.directory, 'tmp').listFiles().length > 0) {
throw new Error("Temporary directory not empty");
}
-
- if (project.properties['skipJacoco'] == 'true' || !new File(project.build.directory, 'jacoco.exec').exists()) {
- project.properties['skipJacocoAttach'] = 'true'
- }
</script>
</scripts>
</configuration>
@@ -1146,29 +1141,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-jacoco-exec</id>
- <phase>verify</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <skipAttach>${skipJacocoAttach}</skipAttach>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/jacoco.exec</file>
- <classifier>jacoco</classifier>
- <type>exec</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
Modified: webservices/axiom/branches/1.2.x/src/site/site.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/src/site/site.xml?rev=1849746&r1=1849745&r2=1849746&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/src/site/site.xml (original)
+++ webservices/axiom/branches/1.2.x/src/site/site.xml Wed Dec 26 09:48:25 2018
@@ -76,7 +76,7 @@
<item name="Javadocs" href="/apidocs/index.html"/>
<item name="FAQ" href="faq.html"/>
<item name="View Source" href="http://svn.apache.org/viewvc/webservices/axiom/trunk/?root=Apache-SVN"/>
- <item name="Code Coverage" href="code-coverage/index.html"/>
+ <item name="Code Coverage" href="https://codecov.io/gh/apache/webservices-axiom"/>
<item name="Privacy Policy" href="privacy-policy.html"/>
</menu>
<menu name="Modules">