buildbot success in on cxf-site-production
The Buildbot has detected a restored build on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/32711 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/32710 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[cxf] 01/02: Update org.eclipse.microprofile.rest.client
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit bdd121031c94f9b1c25151c99c12973a2a51d360 Author: Alexey Markevich AuthorDate: Fri May 31 13:20:02 2019 +0300 Update org.eclipse.microprofile.rest.client --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d532f45..9762c8e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -251,7 +251,7 @@ 3.2.9.RELEASE - 1.3.1 + 1.3.2 1.1
[cxf] 02/02: Update wiremock-maven-plugin
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ec1f1bbca53a5831856fd922af83e763ed8f4d5d
Author: Alexey Markevich
AuthorDate: Fri May 31 13:20:20 2019 +0300
Update wiremock-maven-plugin
---
systests/microprofile/client/weld/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/systests/microprofile/client/weld/pom.xml
b/systests/microprofile/client/weld/pom.xml
index b608f94..1d8f0a5 100644
--- a/systests/microprofile/client/weld/pom.xml
+++ b/systests/microprofile/client/weld/pom.xml
@@ -94,7 +94,7 @@
uk.co.automatictester
wiremock-maven-plugin
-4.1.0
+4.4.1
generate-test-sources
@@ -102,7 +102,7 @@
run
-target/classes
+${project.build.outputDirectory}
${cxf.wiremock.params}
[cxf] branch master updated (37fecc9 -> ec1f1bb)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 37fecc9 Merge branch 'master' of github.com:apache/cxf new bdd1210 Update org.eclipse.microprofile.rest.client new ec1f1bb Update wiremock-maven-plugin 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: parent/pom.xml| 2 +- systests/microprofile/client/weld/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[cxf] branch 3.2.x-fixes updated: Cast to Buffer to call flip so code compiled with Java11 will run on Java8
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 37db3c2 Cast to Buffer to call flip so code compiled with Java11 will
run on Java8
37db3c2 is described below
commit 37db3c253b12cab90160f01857edda44cd592f7a
Author: Daniel Kulp
AuthorDate: Fri May 24 10:42:51 2019 -0400
Cast to Buffer to call flip so code compiled with Java11 will run on Java8
(cherry picked from commit d89cfe4f6a52d133205af80fd363ecfdc85e41e5)
---
core/src/main/java/org/apache/cxf/common/util/UrlUtils.java | 3 ++-
core/src/main/java/org/apache/cxf/io/ReaderInputStream.java | 13 +++--
.../http/asyncclient/CXFHttpAsyncRequestProducer.java | 3 ++-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
index 6d65b12..f06da23 100644
--- a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
@@ -21,6 +21,7 @@ package org.apache.cxf.common.util;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.nio.Buffer;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
@@ -105,7 +106,7 @@ public final class UrlUtils {
out.put((byte) b);
}
}
-out.flip();
+((Buffer)out).flip();
return Charset.forName(enc).decode(out).toString();
}
return value;
diff --git a/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
index dd4c533..6f0ced9 100644
--- a/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
@@ -21,6 +21,7 @@ package org.apache.cxf.io;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
@@ -121,9 +122,9 @@ public class ReaderInputStream extends InputStream {
this.reader = reader;
this.encoder = encoder;
this.encoderIn = CharBuffer.allocate(bufferSize);
-this.encoderIn.flip();
+((Buffer)this.encoderIn).flip();
this.encoderOut = ByteBuffer.allocate(128);
-this.encoderOut.flip();
+((Buffer)this.encoderOut).flip();
}
/**
@@ -193,7 +194,7 @@ public class ReaderInputStream extends InputStream {
private void fillBuffer() throws IOException {
if (!endOfInput && (lastCoderResult == null ||
lastCoderResult.isUnderflow())) {
encoderIn.compact();
-int position = encoderIn.position();
+int position = ((Buffer)encoderIn).position();
// We don't use Reader#read(CharBuffer) here because it is more
efficient
// to write directly to the underlying char array (the default
implementation
// copies data to a temporary char array).
@@ -201,13 +202,13 @@ public class ReaderInputStream extends InputStream {
if (c == -1) {
endOfInput = true;
} else {
-encoderIn.position(position + c);
+((Buffer)encoderIn).position(position + c);
}
-encoderIn.flip();
+((Buffer)encoderIn).flip();
}
encoderOut.compact();
lastCoderResult = encoder.encode(encoderIn, encoderOut, endOfInput);
-encoderOut.flip();
+((Buffer)encoderOut).flip();
}
/**
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java
index ecb4a3f..f78bbcf 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java
@@ -23,6 +23,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
@@ -79,7 +80,7 @@ public class CXFHttpAsyncRequestProducer implements
HttpAsyncRequestProducer {
}
}
int i = -1;
-buffer.rewind();
+((Buffer)buffer).rewind();
if (buffer.hasRemaining() && chan != null) {
i = chan.read(buffer);
[cxf] branch 3.2.x-fixes updated: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.2.x-fixes by this push: new 38810a3 Recording .gitmergeinfo Changes 38810a3 is described below commit 38810a3b9c347580d60ef20a20c4dd38ffe2ffcd Author: Colm O hEigeartaigh AuthorDate: Fri May 31 09:27:13 2019 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 25 + 1 file changed, 25 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 7444890..d2518cb 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -11,6 +11,7 @@ B 02fbea2b202db56b45efb69b48389c7ad30db391 B 032c81ea4bfa68bb34774c1874852fd6c0c0dc1f B 03855282acc61e15c0048bb18ebda5242873ebbc B 0387d3b44e6eba59e1bc4963c89f1294ab7fcc01 +B 04b232d262b54f1cfa92d891f97adfe5e50d5930 B 055a2ec152d9945b0817c2fac82af43d0692bfd5 B 057f4dc521f02227d7b36bbb508835a9edb69e15 B 07251d65ed30455dd982fdbe694aab419d2fbfcb @@ -23,6 +24,7 @@ B 098baf4d9cba731cdc019ab5b60af9df060b6ede B 0a0fea05db9c93ac8a9f87bf1ffe50c3f95531d6 B 0a84f64aed1a79585cb59ff589be95440e6a8480 B 0af01b0a9ded128d72c216b52e2560d5c9450b18 +B 0b80003c3dc8cc7f758c561a08b0edcdfdc76d8c B 0b808a68b71b5dec8c72355ef5d8aaf614f1636a B 0bd8eaef0a1b6ea87aa07f605e7ea8ace82698a2 B 0cdc4bb5e37fabbf6afeef47ce7c9913f3282103 @@ -53,11 +55,13 @@ B 1a1f76c5cfd7d9dfbb3334cd9ba2b4dbdf170ef7 B 1a321e2d766087025cabd339a4e13643833c1a56 B 1b46339f841756b35846c1389860ee615ba91ddf B 1cfdb42724549fdef21a9d50d62cd9dbdc5d8dd3 +B 1d1694a70c22d5dff10aebdae588d3dd1aff25e1 B 1e35c3ac012c3acda3b82f225bada42c883e4098 B 1e3f132d74bf032be991995a587b7d107424ff05 B 1f431e2f8063793e84af56bc645484a9f0da58e7 B 1f8fec397203db2e0b046d8239e31860d0e4b444 B 1f973f3a5aa8f2c919a1d3852f1eb0eccb949bee +B 208b581837430a97d9e13318603af679674b8092 B 21138b4ce300510f442475f1a59b2fac03f366dd B 2157f30f50a0626e725c6398e534d10d845219e0 B 2288ddf9f17f674f1406d0772f738ca37835361e @@ -89,6 +93,7 @@ B 2c7c05fc2009fa7c1449ed2d5fa6aa150bfba33a B 2c7d90e86e29000111b5551d21400f71f8383105 B 2cb11b19660909971e7cd475bd358c6830773e58 B 2cc3dab0e8423c7ac364480e3ec844b3f8792b52 +B 2d0c4633eef82a7eb5853ad5380cb5259da0992f B 2d71a5c72d40d9c21b6c51d0bcbad70cbb6500f7 B 2db1206ab6ae5db6fefe9adf0f6df837b0dd8e65 B 2e44ce12233c213b5fef8bbc28d71554554a8fbb @@ -116,12 +121,15 @@ B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d B 384a11f419c06c52ec07d9f7114bb2134c18ba3c B 38582fbab7ca33b1383715f1f5094b9b46a0303f B 38f8280925eead756fdcd299ca7476d17cbde0c2 +B 38fe864233b66c14616aa10ad7025a74b1dba691 B 3905044328637d6e51d0c4e2548e81885ca04075 B 3912e7beb77beb5782abc46488a1f648515c62bc B 393bd8fa77728391ef8d4d9457c2a36ba42c72b8 B 39a58f3c6ab6f1d20e4a11b76edf5a443e83 B 39af827a897824749f269a3dffc2db920e6b8216 B 3a0b939b04d5e59388ff536ac93e7cf3f8793571 +B 3a1f54d82c94f0b5527f8a0f164bf602227bd437 +B 3a984d3b0ec367b219a56d059e0c9e268c82ef91 B 3a99c26ad254f34525837ceaf0c8baaac24f4336 B 3c1b69e419333e7c49209bb72f7da79d3ee019cd B 3c82c9da13a616c0da987063841980d9c61e4840 @@ -157,6 +165,7 @@ B 47b9192974848430153175ea9cefc35268bd8df5 B 47cf25f1335724c96a9793d102eb71eeaa6537d3 B 47ee9bd6e385c5559e3e31b2e3670630c9f4607a B 48825297a86e619cf6c3b2e858bdfb4dafda62f3 +B 493f5de94e57a86e50c5e2c8d177eff4e39a461a B 4955ca652f16e781524612383af27c650e10cbdc B 498129c6d5b4545e67a7d671f51a54c2e1156928 B 49f857cd41996bb0fd99637eabf3fa6267344fd5 @@ -176,6 +185,7 @@ B 52856a8e43e5b05952b837611f2bb1289651b012 B 5323c53ca578b33ac85c6618e365581685e6bb81 B 53fd401ef4a69d112310640b0c85caee844bbf50 B 542bad9a529fcb296011234284493e143e9f0e14 +B 5464908d75ec9a2cd7093407dba7723c1269a65d B 5480eb2c1b5b8c26cc86d70a7d07d794c2144f1a B 54d812a2cbba2d132e288902ce4a43d868a2282f B 5544a990e1272bf72fbbb7bb5104409d020328e3 @@ -204,6 +214,7 @@ B 5ecf2214e4cfa0992da3ca74cd92128a3048b4f4 B 5f102913d6e112ea6a2176f45aaee4890adc1a6a B 5fdfd70af65f53b0bd73ecfc10906e28648ede94 B 605e2ec9844a890a0c5a1b56a16c1f603be61bcf +B 606fc57d2f68f5bc3643aadaf77564a40f75a2f9 B 60b0165afccb03816ada90271d1bfc66a6c2eb52 B 60c4c6418a285d71fc197dc953332d987e7651d9 B 612b03ea00b8a9e747411dbfa9a4eb1c6ff4b529 @@ -215,6 +226,7 @@ B 62b20e87b46bfcdcee48f8f7cb509bc3bc05a230 B 6307f6334302c370b8a463914c963f4f644ce536 B 63a24ccb4d22410b27dabcc953b3664bf49e44b3 B 63f3a02afddd8e8e82aed4c18e24627b4c284a12 +B 6488c5f422c8df8808f629efd44d19b6f6c7e48d B 64dd999db1c712cd54f003a76abe1d221a1e3295 B 64e00d57016e7066858fc061ca9d1f16a7a025ae B 64f28032da4c509ecfa1661351f83672b6691664 @@ -229,6 +241,7 @@ B 68af13530379662fc99a716d635d4aab7c5fb027 B 69d9b04b5404ac4417c678d68343627510e2a7f7 B 6a21a926b3a4d32af0bc2a81117d0f678d3c3c7e B 6a4b3777d6432c7d44fdd8ce91b495e51ba1b218 +B 6a5ecb6d063037c7f8786b67294d32e5b28895bc B 6acd80b9cd4aff1a866d84ad8a86afb33bfefde3 B 6ae17b03967f7b397c7217d52f3d7cf9e28cd999 B
[cxf] branch master updated: parse cxf.jaxrs.extensions like it done in CXFNonSpringJaxrsServlet, but with ", " separator
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new bdae8a1 parse cxf.jaxrs.extensions like it done in
CXFNonSpringJaxrsServlet, but with "," separator
new a5e7f3b Merge pull request #559 from slavb18/master
bdae8a1 is described below
commit bdae8a1b0237f2fb8bdee8c2f7548036b79930ec
Author: slavb18
AuthorDate: Fri May 31 10:04:38 2019 +0400
parse cxf.jaxrs.extensions like it done in CXFNonSpringJaxrsServlet, but
with "," separator
---
.../spring/AbstractSpringConfigurationFactory.java | 28 ++
1 file changed, 28 insertions(+)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
index ce8b360..11f610c 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
@@ -19,7 +19,9 @@
package org.apache.cxf.jaxrs.spring;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBus;
@@ -39,6 +41,8 @@ public abstract class AbstractSpringConfigurationFactory
protected ApplicationContext applicationContext;
@Value("${cxf.jaxrs.server.address:}")
private String jaxrsServerAddress;
+@Value("${cxf.jaxrs.extensions:}")
+private String jaxrsExtensions;
protected Server createJaxRsServer() {
@@ -53,6 +57,9 @@ public abstract class AbstractSpringConfigurationFactory
factory.setOutInterceptors(getOutInterceptors());
factory.setOutFaultInterceptors(getOutFaultInterceptors());
factory.setFeatures(getFeatures());
+if (!StringUtils.isEmpty(jaxrsExtensions)) {
+
factory.setExtensionMappings((Map)parseMapSequence(jaxrsExtensions));
+}
finalizeFactorySetup(factory);
return factory.create();
}
@@ -90,4 +97,25 @@ public abstract class AbstractSpringConfigurationFactory
protected void finalizeFactorySetup(JAXRSServerFactoryBean factory) {
// complete
}
+protected static Map parseMapSequence(String sequence) {
+if (sequence != null) {
+sequence = sequence.trim();
+Map map = new HashMap<>();
+String[] pairs = sequence.split(",");
+for (String pair : pairs) {
+String thePair = pair.trim();
+if (thePair.length() == 0) {
+continue;
+}
+String[] value = thePair.split("=");
+if (value.length == 2) {
+map.put(value[0].trim(), value[1].trim());
+} else {
+map.put(thePair, "");
+}
+}
+return map;
+}
+return Collections.emptyMap();
+}
}
