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/27 22:45:16 UTC
svn commit: r1849821 - in /webservices/axiom/branches/1.2.x: ./ pom.xml
systests/jboss-tests/pom.xml
Author: veithen
Date: Thu Dec 27 22:45:16 2018
New Revision: 1849821
URL: http://svn.apache.org/viewvc?rev=1849821&view=rev
Log:
Merge r1849791 and r1849806 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/jboss-tests/pom.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 27 22:45:16 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,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758
+/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,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1849821&r1=1849820&r2=1849821&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Thu Dec 27 22:45:16 2018
@@ -264,7 +264,6 @@
<exam.version>4.7.0</exam.version>
<skipDeploy>false</skipDeploy>
- <hermeticTests>true</hermeticTests>
</properties>
<repositories>
@@ -592,7 +591,7 @@
the data instead of loading it into memory). Obviously, the execution time of
these tests also are proportional to the heap size. To accelerate the execution
of the tests, we should use a heap size as small as possible. -->
- <argLine>${argLine} -Xms16m -Xmx48m ${securityManagerArgs}</argLine>
+ <argLine>${argLine} -Xms16m -Xmx48m</argLine>
<systemProperties>
<property>
<name>java.io.tmpdir</name>
@@ -631,7 +630,6 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19</version>
<configuration>
- <argLine>${argLine} ${securityManagerArgs}</argLine>
<systemProperties>
<property>
<name>java.io.tmpdir</name>
@@ -925,51 +923,6 @@
</configuration>
</execution>
<execution>
- <id>generate-policy-file</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <scripts>
- <script><![CDATA[
- import static groovy.json.StringEscapeUtils.escapeJava
-
- if (project.packaging != 'pom' && project.properties['hermeticTests'] == 'true') {
- new File(project.build.directory, "test.policy").withWriter { out ->
- out.println "grant {"
- out.println """ permission java.io.FilePermission "${escapeJava(System.properties.'java.home')}\${/}-", "read";"""
- out.println """ permission java.io.FilePermission "${escapeJava(session.settings.localRepository)}\${/}-", "read";"""
- session.sortedProjects.each({
- out.println """ permission java.io.FilePermission "${escapeJava(it.build.directory)}\${/}*", "read";"""
- })
- out.println """ permission java.io.FilePermission "${escapeJava(project.basedir.absolutePath)}\${/}-", "read";"""
- out.println """ permission java.io.FilePermission "${escapeJava(project.build.directory)}", "read,write";"""
- out.println """ permission java.io.FilePermission "${escapeJava(project.build.directory)}\${/}-", "read,write,delete";"""
- out.println """ permission java.lang.RuntimePermission "*";"""
- out.println """ permission java.lang.reflect.ReflectPermission "*";"""
- out.println """ permission java.net.NetPermission "*";"""
- out.println """ permission java.net.SocketPermission "localhost", "connect,listen,accept,resolve";"""
- out.println """ permission java.security.SecurityPermission "*";"""
- out.println """ permission java.util.PropertyPermission "*", "read,write";"""
- out.println """ permission javax.management.MBeanPermission "*", "*";"""
- out.println """ permission javax.management.MBeanServerPermission "*";"""
- out.println """ permission javax.management.MBeanTrustPermission "*";"""
- out.println """ permission javax.xml.bind.JAXBPermission "*";"""
- out.println """ permission javax.xml.ws.WebServicePermission "publishEndpoint";"""
- out.println """ permission org.osgi.framework.AdminPermission "*", "*";"""
- out.println """ permission org.osgi.framework.ServicePermission "*", "register,get";"""
- out.println "};"
- }
- project.properties['securityManagerArgs'] = '-Djava.security.manager -Djava.security.policy=' + project.build.directory.replace('\\', '/') + '/test.policy'
- } else {
- project.properties['securityManagerArgs'] = ''
- }
- ]]></script>
- </scripts>
- </configuration>
- </execution>
- <execution>
<id>check-tmp-dir</id>
<phase>verify</phase>
<goals>
@@ -1046,6 +999,18 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>hermetic-maven-plugin</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-policy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.14</version>
Modified: webservices/axiom/branches/1.2.x/systests/jboss-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/systests/jboss-tests/pom.xml?rev=1849821&r1=1849820&r2=1849821&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/systests/jboss-tests/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/systests/jboss-tests/pom.xml Thu Dec 27 22:45:16 2018
@@ -34,7 +34,6 @@
<properties>
<jboss.version>8.2.1.Final</jboss.version>
<jboss.home>${project.build.directory}/wildfly-${jboss.version}</jboss.home>
- <hermeticTests>false</hermeticTests>
</properties>
<dependencies>
@@ -72,6 +71,13 @@
</testResources>
<plugins>
<plugin>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>hermetic-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>