You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/07/07 18:26:34 UTC
[cxf] branch 3.5.x-fixes updated (804b0133c1 -> d69cda51b1)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 804b0133c1 Fix Checkstyle violations
new a46348b9ce Attempt to fix 'CreateProcess error=206, The filename or extension is too long' on Windows
new 02d49ffb0c Bump feign-core from 12.3 to 12.4 (#1335)
new b5bf774504 Bump feign-httpclient from 12.3 to 12.4 (#1336)
new d69cda51b1 Recording .gitmergeinfo Changes
The 4 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:
.gitmergeinfo | 15 ++++++++++++++
.../samples/jax_rs/tracing_opentracing/pom.xml | 4 ++--
.../apache/cxf/testutil/common/ServerLauncher.java | 23 ++++++++++++++--------
3 files changed, 32 insertions(+), 10 deletions(-)
[cxf] 01/04: Attempt to fix 'CreateProcess error=206, The filename or extension is too long' on Windows
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a46348b9ce7a7ac582f2e1c8955ad4c01343bd21
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jul 5 20:14:45 2023 -0400
Attempt to fix 'CreateProcess error=206, The filename or extension is too long' on Windows
(cherry picked from commit 2ed6770c25ad377bf21bce7a60d3e0ae1adc3035)
(cherry picked from commit 03a9301136c34b2b03fa860c25b1d1eb9569668c)
---
.../apache/cxf/testutil/common/ServerLauncher.java | 23 ++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
index e3eb171bc1..60c9b7fa29 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
@@ -28,6 +28,7 @@ import java.lang.reflect.Constructor;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -206,15 +207,16 @@ public class ServerLauncher {
}
} else {
- List<String> cmd = getCommand();
+ Map.Entry<Map<String, String>, List<String>> commandAndEnvironment = getCommandAndEnvironment();
+ List<String> cmd = commandAndEnvironment.getValue();
LOG.fine("CMD: " + cmd);
if (DEBUG) {
System.err.print("CMD: " + cmd);
}
-
ProcessBuilder pb = new ProcessBuilder(cmd);
+ pb.environment().putAll(commandAndEnvironment.getKey());
pb.redirectErrorStream(true);
process = pb.start();
@@ -334,8 +336,8 @@ public class ServerLauncher {
}
}
- private List<String> getCommand() {
-
+ private Map.Entry<Map<String, String>, List<String>> getCommandAndEnvironment() {
+ Map<String, String> env = new HashMap<>();
List<String> cmd = new ArrayList<>();
cmd.add(JAVA_EXE);
@@ -379,7 +381,6 @@ public class ServerLauncher {
cmd.add("-Djava.util.logging.config.file=" + loggingPropertiesFile);
}
- cmd.add("-classpath");
StringBuilder classpath = new StringBuilder(System.getProperty("java.class.path"));
if (classpath.indexOf("/.compatibility/") != -1) {
classpath.append(':');
@@ -390,8 +391,14 @@ public class ServerLauncher {
classpath.replace(idx1, idx2, ":");
}
- cmd.add(classpath.toString());
-
+ boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+ if (!isWindows) {
+ cmd.add("-classpath");
+ cmd.add(classpath.toString());
+ } else {
+ // Overcoming "CreateProcess error=206, The filename or extension is too long"
+ env.putIfAbsent("CLASSPATH", classpath.toString());
+ }
// If the client set the transformer factory property,
// we want the server to also set that property.
@@ -420,7 +427,7 @@ public class ServerLauncher {
}
}
- return cmd;
+ return new SimpleEntry<>(env, cmd);
}
static class Mutex {
[cxf] 03/04: Bump feign-httpclient from 12.3 to 12.4 (#1336)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b5bf774504c992b139afcc216e3488f6914b8879
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Jul 7 08:15:07 2023 -0400
Bump feign-httpclient from 12.3 to 12.4 (#1336)
Bumps [feign-httpclient](https://github.com/openfeign/feign) from 12.3 to 12.4.
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/12.3...12.4)
---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-httpclient
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 9cc6d1e60c94d5c8c659d20135defd31763e124e)
(cherry picked from commit dd53f33353d5927081e9ab8278b2e6327d3142a9)
---
.../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index c3da2e8bd9..7957c188eb 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-httpclient</artifactId>
- <version>12.3</version>
+ <version>12.4</version>
</dependency>
<dependency>
<groupId>io.github.openfeign.opentracing</groupId>
[cxf] 04/04: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d69cda51b1de15a822d81232bd3267f85790b35e
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Jul 7 14:18:01 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b5d9fa3fbb..f6033ea477 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -25,7 +25,9 @@ B 12b4e3a4d9d2f3d8cc380e998b9e44f43e2a8479
B 137df3a5340e0f940ef7e5634468414fdcde4664
B 14fde35cbb22f301217be8e1b56ef405eab70682
B 163b3fe30093c41d605c84df76867a89c5c45443
+B 167bc8d28800f0cb8b994fa373e56604be0aa354
B 16abd42faf056ed43e3310a45ce1a42f75b446cf
+B 19677189db076ec737334645d80bb7abde127d97
B 1a1a7aa30b1f95eff90588181863119df9c9a1e0
B 1abade949dd09d2c4d301c65fc237a01ef870e34
B 1b2d8b7c2b5354f915c18c1006ccc714f91139bb
@@ -87,7 +89,9 @@ B 4b63dbb428488f3a6d0b7114632404b31458a521
B 4cf375c5436f3e806293a73a5bb6a8510f7ac961
B 4e49ccab53e40384a5bc3cd966b7a8f2636dcbb3
B 4fb98f6023bc6dab00cbf27f4a33ae0ea20f3b38
+B 4ff95e740d46ff0a04adcbbc6b36b89e5acb89d0
B 504c3b5890dc251f7fc2d75dc462610d7e0d4bdb
+B 50a2a958995b6d8a6c6f25e3c5af8f76fa18a641
B 517bbbdb62c44b32c660bfbd0fdb53609b8759cb
B 51c8926f0329c29c2559e5c63a59b1c28b811c3d
B 526ecd8e23add39d60647da80d48ed9149bd263a
@@ -182,6 +186,7 @@ B 9e81dd7676ca0e6621a32d8917a9669e1bdf011e
B 9eb007befbe8d630750ab270b1cabfa3ba30b60a
B 9fb0bff003c4c3beecdbfbf0869804604f87f79d
B a05b8d10d1fbeacbf3d33cfcccd302958b28ad0a
+B a1532c92f199170bb1adafc0f09563236b0e1772
B a275ab89f17d446da5e215539a44cd05606be9e2
B a2965420765203db3bcaa11188b4ae66a47f41d1
B a375e335cb04700580cb048ab25c9a4486a632d9
@@ -197,6 +202,7 @@ B aa732af19fc413a3d8efe09c272066180fdb8a52
B aaf83088ca660871fb0d457b095c6239dac27719
B ac15d88752d507319e66b65da82c5d4045647e17
B ac6f425a395cb627ad794ac3750924d7eb791ed3
+B aceb5a29385099ff0f3bbf88c2bdcabb4147c39d
B ad496ed008ae0b0d2636bc307559749fc28287c1
B ae865c4aeb8d3ed8019fd0d23b0bbc38f0e66506
B af151eef0f4c90a9a538ca31023198c370164e99
@@ -264,6 +270,7 @@ B dd5fda60e21e734576cc4535d02fbeb360cda4c1
B de920dee3d4606fc1997e7024242bed0ddcb358b
B df24375f02d2e16f0e24e91be57e5800361b483b
B e12adfbfaf08328fb0eae6b16de9db0afc29f884
+B e2609796a3e1bc5c22c97f315ad2b79ec6e97f49
B e2760b48867797054e7fc488f04e4b6e5a792716
B e3a719290b5eb18db1609218211a1ce59a332462
B e3b97c8fb3a26a7604234b93c3c4a93ed7227cc5
@@ -317,6 +324,7 @@ M 1b4c763d8d8da47ed05f618ac5650ee10c10edbf
M 1d125604a756ee0c4da875545013c70355f77542
M 1e6e2ac84a703685bb402c44b687a0cd4e2bcdee
M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b
+M 1f11e61729d9482d23048076703a6431646d6c38
M 20a457ef90cbf59c5382272611e33f41d9a482bb
M 21131c03499c0e1f35838bf2667ef14d71b3acf1
M 21892efb49facc7243e7284d9fd5d3ba988c3a65
@@ -351,6 +359,7 @@ M 3c95abf3be5c52a4b800f8139f8633088f0c9be7
M 3d71fe88f5d9649f3b770598b5b170cb6bc8871f
M 3dabee6e40229669b98654c72723392e9e06f6be
M 3e83c742e89621b37b4668768918e90b966d17b6
+M 40b02ca3e9d96e7d035f5361556778f9e7cbbef6
M 40d34074f87d33e430e1cf0234f3362ffa00b091
M 40f09e6a0db63c8cddbd937bc4e26c3dd7ab7425
M 410728df7c306a759afb74e51c609ccac86920b5
@@ -411,6 +420,7 @@ M 77bf6ad084d900e11832b5b9b15ec6291be58732
M 7853be3288f065a4181f178c1bc49edff663af1c
M 7a4d0b1b6b71e5253e6a4e21b45e4b6fd1d714ae
M 7b2e7af4f94bd26db08866fd24563df53af8977c
+M 7fb5cdd08ab862f60bb867086e0d667bf4333f37
M 8108bd9bdbc5ec3d00d7dad8b775eff72689560d
M 810ac858b479d933629abde47b44067be423c6ca
M 819ff756a4a0ff34a6318661854cc57a24955e8a
@@ -427,6 +437,7 @@ M 8c348a6138035882657a37b738e13b755fbe231f
M 8d51dc8111e0083f1bbba311b9676872c8178a8a
M 8e2ce5d61df95daaaeee0209e9c9d768ca8bf6a2
M 8ef05ab891bfa009b279870d195dd767b2dd428d
+M 8fbb408a21c7f573d5b8cfc8ea05112e06152635
M 901da059d3d23b9956d937ae3fdbcbb81c62eb75
M 9031457c538ccfe133357ab039afb2a013a2fe82
M 905f4f91e4d0b5c4d145729f16bad90b1847f0be
@@ -441,10 +452,12 @@ M 980ebec9b4e3cb99c0386ba3c795cad21e924ac7
M 99a3b2ce160848b6dd4eafc2cbca9e4a3467b5f3
M 9a8b2c051c3cd9381398915a9069e8faf48dc887
M 9ae9e3a3d8ee4d7a057f8abeb1ec058a496a40b3
+M 9b166d741d55af9688f76cbca94f0cd6c835a9cb
M 9b8c9b20114b7102fc1330a117c9e017140f0eb8
M 9ea53266ba0b51a43344b9dcc2e020bac26dfd4d
M 9ebf3d40ac6db1dc51aa49fd9e3a5c3129b252c9
M 9f1c04b14ba55a88f77204380626c3aafaf6d56d
+M a44c0f50b9d451b9f6201602722297f5b132b1dd
M a529faa54dc55f8b489908730d229b37da6638ed
M a5ad0b1798aac1f5df2f725363f932a808395b3e
M a65137905175b6a02fb8f704d3363e62dc3069f9
@@ -473,6 +486,8 @@ M ba58c444dd835e105136b9eab74e5c0e9e80914b
M bb048f3554f56ac31b139ff79984f0c332abd148
M bd3e3de2fe775ab49ac2b381008636ba2f326152
M c03222caa4adf3ef0c97750a40430b09fe4ba80c
+M c04efa86c8abb54b3084a6f0f191d2f98ab8bad8
+M c2c40943cee8b0d9f1a3c8d0876f2474cb96e3d7
M c3fa8f19ed721b21e1e18133e9eb20b2906a5eaf
M c4c9de9f13d3a65e3f532e2a72dc784ed3f36366
M c5b7db5a4cceb3df6094ee38215725fd4ecc2b8c
[cxf] 02/04: Bump feign-core from 12.3 to 12.4 (#1335)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 02d49ffb0cf2f139b2d40c6258fef33429c44cde
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Jul 7 08:14:37 2023 -0400
Bump feign-core from 12.3 to 12.4 (#1335)
Bumps [feign-core](https://github.com/openfeign/feign) from 12.3 to 12.4.
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/12.3...12.4)
---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-core
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 8176ba52cbbbf46a0d7cedf54e0ab609b9df1708)
(cherry picked from commit 5a47f5fa9883120aeaab79748dcf13dbed0729cd)
---
.../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index dee0203cf5..c3da2e8bd9 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -134,7 +134,7 @@
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-core</artifactId>
- <version>12.3</version>
+ <version>12.4</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>