You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2020/12/20 11:37:38 UTC
[axis-axis1-java] branch master updated (2e2682a -> e91f3e3)
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git.
from 2e2682a Update emf-maven-plugin
new dadc701 Don't use a parent POM for plugin integration tests
new e91f3e3 Make test execution more robust
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
integration/pom.xml | 4 ++++
.../src/it/writeStubToTestSources/pom.xml | 5 -----
maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml | 5 -----
pom.xml | 15 +++++++++++++++
samples/transport-sample/pom.xml | 8 ++++++++
5 files changed, 27 insertions(+), 10 deletions(-)
[axis-axis1-java] 01/02: Don't use a parent POM for plugin
integration tests
Posted by ve...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit dadc701203ddbbb91761110f139c8a17f34017c1
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sat Dec 19 21:51:00 2020 +0000
Don't use a parent POM for plugin integration tests
For integration test projects executed using maven-invoker-plugin, using
the same parent POM as the main project results in unintended plugin
executions during test runs.
---
maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml | 5 -----
maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml | 5 -----
2 files changed, 10 deletions(-)
diff --git a/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml b/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
index eee18bb..df7d538 100644
--- a/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
+++ b/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
@@ -19,11 +19,6 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>@project.groupId@</groupId>
- <artifactId>axis-project</artifactId>
- <version>@project.version@</version>
- </parent>
<groupId>test</groupId>
<artifactId>writeStubToTestSources</artifactId>
<version>1</version>
diff --git a/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml b/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
index 6630ce5..ce36d32 100644
--- a/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
+++ b/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
@@ -19,11 +19,6 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>@project.groupId@</groupId>
- <artifactId>axis-project</artifactId>
- <version>@project.version@</version>
- </parent>
<groupId>test</groupId>
<artifactId>wsrf</artifactId>
<version>1</version>
[axis-axis1-java] 02/02: Make test execution more robust
Posted by ve...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit e91f3e3682e00e36df6a7f67a1bbf4f1048e8bff
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sun Dec 20 11:22:03 2020 +0000
Make test execution more robust
- Execute tests hermetically where possible. This shields the tests from
weird interactions with the local network configuration.
- Run the integration tests in a fixed time zone. For some reason they
fail in Europe/London.
---
integration/pom.xml | 4 ++++
pom.xml | 15 +++++++++++++++
samples/transport-sample/pom.xml | 8 ++++++++
3 files changed, 27 insertions(+)
diff --git a/integration/pom.xml b/integration/pom.xml
index 07d55ca..7d7ce7e 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1543,6 +1543,10 @@
<java.awt.headless>true</java.awt.headless>
<test.functional.ServicePort>${test.functional.ServicePort}</test.functional.ServicePort>
</systemPropertyVariables>
+ <environmentVariables>
+ <!-- TODO: some tests fail in specific time zones (e.g. Europe/London) -->
+ <TZ>PST8PDT</TZ>
+ </environmentVariables>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 08849eb..8b1e9df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -422,6 +422,21 @@
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.0-beta-2</version>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>hermetic-maven-plugin</artifactId>
+ <version>0.5.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-policy</goal>
+ </goals>
+ <configuration>
+ <allowCrossProjectAccess>true</allowCrossProjectAccess>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
diff --git a/samples/transport-sample/pom.xml b/samples/transport-sample/pom.xml
index 2f91607..acb4de8 100644
--- a/samples/transport-sample/pom.xml
+++ b/samples/transport-sample/pom.xml
@@ -53,6 +53,14 @@
<build>
<plugins>
<plugin>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>hermetic-maven-plugin</artifactId>
+ <configuration>
+ <!-- TODO: the sample transport writes files to the project root directory -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>