[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] 02/02: Make test execution more robust
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
AuthorDate: Sun Dec 20 11:22:03 2020 +
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 @@
true
${test.functional.ServicePort}
+
+
+PST8PDT
+
diff --git a/pom.xml b/pom.xml
index 08849eb..8b1e9df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -422,6 +422,21 @@
maven-scm-publish-plugin
1.0-beta-2
+
+com.github.veithen.maven
+hermetic-maven-plugin
+0.5.0
+
+
+
+generate-policy
+
+
+
true
+
+
+
+
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 @@
+com.github.veithen.maven
+hermetic-maven-plugin
+
+
+true
+
+
+
maven-surefire-plugin
[axis-axis1-java] 01/02: Don't use a parent POM for plugin integration tests
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 AuthorDate: Sat Dec 19 21:51:00 2020 + 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 @@ --> 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";> 4.0.0 - -@project.groupId@ -axis-project -@project.version@ - test writeStubToTestSources 1 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 @@ --> 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";> 4.0.0 - -@project.groupId@ -axis-project -@project.version@ - test wsrf 1
[axis-axis1-java] branch master updated: Make the wsdl2java-maven-plugin tests succeed with an empty local repo
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
The following commit(s) were added to refs/heads/master by this push:
new 1227217 Make the wsdl2java-maven-plugin tests succeed with an empty
local repo
1227217 is described below
commit 1227217b7eaccd0840dcc958c5dd364e21a45d4d
Author: Andreas Veithen
AuthorDate: Sun Dec 20 12:00:18 2020 +
Make the wsdl2java-maven-plugin tests succeed with an empty local repo
---
maven/wsdl2java-maven-plugin/pom.xml | 16 +--
maven/wsdl2java-maven-plugin/src/it/settings.xml | 53
2 files changed, 13 insertions(+), 56 deletions(-)
diff --git a/maven/wsdl2java-maven-plugin/pom.xml
b/maven/wsdl2java-maven-plugin/pom.xml
index b5acf24..1e463f3 100644
--- a/maven/wsdl2java-maven-plugin/pom.xml
+++ b/maven/wsdl2java-maven-plugin/pom.xml
@@ -83,12 +83,24 @@
+com.github.veithen.maven
+resolver-proxy-maven-plugin
+0.2.0
+
+
+
+start
+stop
+
+
+
+
+
maven-invoker-plugin
integration-test
-install
run
@@ -100,8 +112,6 @@
setup
verify
-
${project.build.directory}/local-repo
-
src/it/settings.xml
clean
install
diff --git a/maven/wsdl2java-maven-plugin/src/it/settings.xml
b/maven/wsdl2java-maven-plugin/src/it/settings.xml
deleted file mode 100644
index 8737d31..000
--- a/maven/wsdl2java-maven-plugin/src/it/settings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
- it-repo
-
-true
-
-
-
- local.central
- @localRepositoryUrl@
-
-true
-
-
-true
-
-
-
-
-
- local.central
- @localRepositoryUrl@
-
-true
-
-
-true
-
-
-
-
-
-
[axis-axis1-java] branch master updated: Revert "AXIS-2295 Apply community suggested fixes to http proxy parameters caching mechanism"
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
The following commit(s) were added to refs/heads/master by this push:
new 1cd08d4 Revert "AXIS-2295 Apply community suggested fixes to http
proxy parameters caching mechanism"
1cd08d4 is described below
commit 1cd08d453ebb17ab6fc0fde05cecbdf24c296bc0
Author: Andreas Veithen
AuthorDate: Sun Dec 20 12:09:00 2020 +
Revert "AXIS-2295 Apply community suggested fixes to http proxy parameters
caching mechanism"
That change causes a test failure in
test.wsdl.multithread.MultithreadTestCase.
This reverts commit a596f2cd4672bfb0c7ce02762c55c6c3eb21e440.
---
.../net/DefaultHTTPTransportClientProperties.java | 40 ++
.../net/TransportClientPropertiesFactory.java | 2 +-
2 files changed, 26 insertions(+), 16 deletions(-)
diff --git
a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
index 6cd5519..44784bd 100644
---
a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
+++
b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
@@ -37,9 +37,11 @@ public class DefaultHTTPTransportClientProperties
* @see
org.apache.axis.components.net.TransportClientProperties#getProxyHost()
*/
public String getProxyHost() {
-proxyHost = AxisProperties.getProperty("http.proxyHost");
-if (proxyHost == null)
-proxyHost = emptyString;
+if (proxyHost == null) {
+proxyHost = AxisProperties.getProperty("http.proxyHost");
+if (proxyHost == null)
+proxyHost = emptyString;
+}
return proxyHost;
}
@@ -47,9 +49,11 @@ public class DefaultHTTPTransportClientProperties
* @see
org.apache.axis.components.net.TransportClientProperties#getNonProxyHosts()
*/
public String getNonProxyHosts() {
-nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
-if (nonProxyHosts == null)
-nonProxyHosts = emptyString;
+if (nonProxyHosts == null) {
+nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
+if (nonProxyHosts == null)
+nonProxyHosts = emptyString;
+}
return nonProxyHosts;
}
@@ -57,9 +61,11 @@ public class DefaultHTTPTransportClientProperties
* @see
org.apache.axis.components.net.TransportClientProperties#getProxyPort()
*/
public String getProxyPort() {
-proxyPort = AxisProperties.getProperty("http.proxyPort");
-if (proxyPort == null)
-proxyPort = emptyString;
+if (proxyPort == null) {
+proxyPort = AxisProperties.getProperty("http.proxyPort");
+if (proxyPort == null)
+proxyPort = emptyString;
+}
return proxyPort;
}
@@ -67,9 +73,11 @@ public class DefaultHTTPTransportClientProperties
* @see
org.apache.axis.components.net.TransportClientProperties#getProxyUser()
*/
public String getProxyUser() {
-proxyUser = AxisProperties.getProperty("http.proxyUser");
-if (proxyUser == null)
-proxyUser = emptyString;
+if (proxyUser == null) {
+proxyUser = AxisProperties.getProperty("http.proxyUser");
+if (proxyUser == null)
+proxyUser = emptyString;
+}
return proxyUser;
}
@@ -77,9 +85,11 @@ public class DefaultHTTPTransportClientProperties
* @see
org.apache.axis.components.net.TransportClientProperties#getProxyPassword()
*/
public String getProxyPassword() {
-proxyPassword = AxisProperties.getProperty("http.proxyPassword");
-if (proxyPassword == null)
-proxyPassword = emptyString;
+if (proxyPassword == null) {
+proxyPassword = AxisProperties.getProperty("http.proxyPassword");
+if (proxyPassword == null)
+proxyPassword = emptyString;
+}
return proxyPassword;
}
}
diff --git
a/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
b/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
index 7aed0ba..7a8ad63 100644
---
a/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
+++
b/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
*/
public class TransportClientPropertiesFactory {
protected static Log log =
-
LogFactory.getLog(TransportClientPropertiesFacto
[axis-axis1-java] branch master updated: Prevent spring-compat-tests from writing to the source directory
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
The following commit(s) were added to refs/heads/master by this push:
new 9811a93 Prevent spring-compat-tests from writing to the source
directory
9811a93 is described below
commit 9811a93521302be583d714ce3f9cf8975d4fd4ab
Author: Andreas Veithen
AuthorDate: Sun Dec 20 12:43:28 2020 +
Prevent spring-compat-tests from writing to the source directory
---
tests/spring-compat-tests/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/spring-compat-tests/pom.xml
b/tests/spring-compat-tests/pom.xml
index 67906b8..3fee5e4 100644
--- a/tests/spring-compat-tests/pom.xml
+++ b/tests/spring-compat-tests/pom.xml
@@ -127,6 +127,7 @@
src/main/webapp
${project.build.directory}/webapp
+${argLine}
-Daxis.attachments.Directory=${project.build.directory}/tmp/attachments
