ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1849744 - in /webservices/axiom/branches/1.2.x: ./ pom.xml systests/osgi-tests/pom.xml
Date Wed, 26 Dec 2018 09:37:47 GMT
Author: veithen
Date: Wed Dec 26 09:37:47 2018
New Revision: 1849744

URL: http://svn.apache.org/viewvc?rev=1849744&view=rev
Log:
Merge r1747866 to the 1.2 branch.

Modified:
    webservices/axiom/branches/1.2.x/   (props changed)
    webservices/axiom/branches/1.2.x/pom.xml
    webservices/axiom/branches/1.2.x/systests/osgi-tests/pom.xml

Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 26 09:37:47 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,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
+/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

Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1849744&r1=1849743&r2=1849744&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Wed Dec 26 09:37:47 2018
@@ -980,6 +980,12 @@
                         <configuration>
                             <scripts>
                                 <script>
+                                    import java.io.File
+                                    
+                                    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'
                                     }

Modified: webservices/axiom/branches/1.2.x/systests/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/systests/osgi-tests/pom.xml?rev=1849744&r1=1849743&r2=1849744&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/systests/osgi-tests/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/systests/osgi-tests/pom.xml Wed Dec 26 09:37:47 2018
@@ -144,6 +144,30 @@
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <!-- Clean up temporary files created by non Axiom code so that
+                             we don't fail the assertion that the temporary directory is
empty. -->
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <excludeDefaultDirectories>true</excludeDefaultDirectories>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.build.directory}/tmp</directory>
+                                    <includes>
+                                        <include>ops4j-store-anonymous-*/**</include>
+                                    </includes>
+                                 </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>



Mime
View raw message