[cxf] 02/03: Fixed checkstyle violations
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5e657afdd4e450fe4be22ddf5f7240254582aa7f
Author: Andriy Redko
AuthorDate: Sat Mar 4 15:12:29 2023 -0500
Fixed checkstyle violations
(cherry picked from commit 15f1c34250d39b413032f03488cda13467a0cbdc)
(cherry picked from commit a849e0b1a7b2db15e045a9624c5a84174e39b35a)
---
.../org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
index b0ecd34200..6f99f58e45 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
@@ -56,7 +56,8 @@ public class AttachmentCallbackHandler implements
CallbackHandler {
message.setAttachments(new ArrayList());
}
attachments = message.getAttachments();
-defaultMimeType = MessageUtils.getContextualString(message,
AttachmentUtil.ATTACHMENT_CONTENT_TYPE, "application/octet-stream");
+defaultMimeType = MessageUtils.getContextualString(message,
AttachmentUtil.ATTACHMENT_CONTENT_TYPE,
+"application/octet-stream");
}
public
AttachmentCallbackHandler(Collection
attachments) {
[cxf] 03/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 7726b5f8fb1d766831f6adf7390ea203d63a0cb5 Author: Andriy Redko AuthorDate: Sat Mar 4 17:08:57 2023 -0500 Recording .gitmergeinfo Changes --- .gitmergeinfo | 5 + 1 file changed, 5 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index f8ca919173..263216ee42 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -212,6 +212,7 @@ B ce2528639b1caf8dffc5d93fa26156481f003f2c B cf9d1b6cd0696a1be6bcfcc99ee7a4676d4d7e41 B d03b70362b2053a6e529250a0a2e5d102a5a198d B d1e39f84005235533212920295314b8347a70b9d +B d329204d8526f016d2740604e7e1dee993dc2461 B d39f491f43e549ce5c50c40d1008d0736fa472a7 B d4acd95ffae200d6020b66cf8ac916ecca37fc52 B d4dd1cf519e9b09e92d366971da2a85e234b70d7 @@ -219,6 +220,7 @@ B d5409bf227b6a00373015d6f92eea00195542b09 B d728e5807c7148b899ce0076d0af730aa192cbff B d7a969c8d2182ee4c342104e4bd55925ddad6d6b B d95c12e6d9945c26a989d7b29b63875547b5fd1b +B dbafe3ab26e4d87ebfa2c8fc4f7cc2534db032a6 B dbbdc2ce6708bf9949e7bdd658a57e3aef8da6ff B dc2b6cc5cc1164f6bb45049bec2373032411f54a B dcba66610ce8fecbeeb5fba45edeb2e74d6ecd7f @@ -301,6 +303,7 @@ M 19fbed8a77a99646b58927c53c8e21057881370f M 1a999f377c2c54c57df12f743d01b7e5eaecf7d1 M 1b48b239be3807e843c56939f663ae935a53f6f5 M 1c7c39771adb05f1fa8678e20b97f1c735f2601c +M 1d8232fc12a1348ef748e3627c834be15bf6e458 M 1f7d72caf45c4351e27d3b04458cc523ccd3bfdf M 204f2b1e7f8c850af25b57bb9ffe461a3e116584 M 20a27b0a4cf238e32a42f51a718c07bb653f19b1 @@ -519,6 +522,7 @@ M a59dff0ba50418ced57ae8ef425f96df78af9f5c M a615cc34ee974469e94c8a0086ec2ed0c84991fa M a6ed23b66394b260145b08ecdd8145b647fa43e5 M a711cfee53fb246201be03b763dbdc54b8eec1ce +M a7a210c01f9358782beb4ff55f4d93195d3806af M a7b4f1698c9f05ad0af949f8a3ab9a45976d9a2d M a7e7e62fd3c68fa3f262bd021ae62076335c359c M a842ad9451c3b6dcc621bdb758231819e84e4cb4 @@ -652,6 +656,7 @@ M f02e401b3e46c42b19db22300691f2197b0abfb7 M f05dbf194b77fc4d71c13af7313eec90af8ee520 M f0e67e2874bc23336b5b445ddfc9e11e7357adc7 M f2c3963682e6ff13ebe75bb21f725aaeac4d33d5 +M f3f643b54fa7c17f5f27c799c19561bf388a651b M f4507e532b47399f627b065ae37d28f2e8d66805 M f7300e4a3df847c567376734579de7a240ac4111 M f8b2df911055acc776c9b7d64fe3ed529858d507
[cxf] 01/03: CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 62fc36d08e0d26b4bef16ce656b848832ac1cf09
Author: Andriy Redko
AuthorDate: Sat Mar 4 11:49:19 2023 -0500
CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078)
(cherry picked from commit 5b32eaf34f5a233d0ad8c69d82b30b4ba10eecb6)
(cherry picked from commit aaf798079d1504dcd64d0685e84a011c4410adb3)
(cherry picked from commit 8ddf1331bab97b07bc40cd1486fbf0196b33688f)
---
.../cxf/attachment/AttachmentDataSource.java | 6 +-
.../cxf/attachment/AttachmentDeserializer.java | 2 +-
.../org/apache/cxf/attachment/AttachmentUtil.java | 23 -
.../java/org/apache/cxf/message/MessageUtils.java | 12 +++
.../cxf/attachment/AttachmentDeserializerTest.java | 101 +
.../apache/cxf/jaxrs/ext/MessageContextImpl.java | 3 +-
.../security/wss4j/AttachmentCallbackHandler.java | 13 ++-
7 files changed, 151 insertions(+), 9 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index ae9ca10ec2..a50a8ac4f7 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -32,7 +32,6 @@ import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
public class AttachmentDataSource implements DataSource {
-
private String ct;
private CachedOutputStream cache;
private InputStream ins;
@@ -78,9 +77,10 @@ public class AttachmentDataSource implements DataSource {
public String getContentType() {
if (StringUtils.isEmpty(ct)) {
-ct = "application/octet-stream";
+return "application/octet-stream";
+} else {
+return ct;
}
-return ct;
}
public InputStream getInputStream() {
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 0f7f6b890f..53a77c505d 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -325,7 +325,7 @@ public class AttachmentDeserializer {
this);
createCount++;
-return AttachmentUtil.createAttachment(partStream, headers);
+return AttachmentUtil.createAttachment(partStream, headers, message);
}
public boolean isLazyLoading() {
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 942c3a9833..802ef87e9c 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -66,6 +66,10 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
public final class AttachmentUtil {
+// The default values for {@link AttachmentDataSource} content type in
case when
+// "Content-Type" header is not present.
+public static final String ATTACHMENT_CONTENT_TYPE =
"org.apache.cxf.attachment.content-type";
+
// The xop:include "href" attribute
(https://www.w3.org/TR/xop10/#xop_href) may include
// arbitrary URL which we should never follow (unless explicitly allowed).
public static final String ATTACHMENT_XOP_FOLLOW_URLS_PROPERTY =
"org.apache.cxf.attachment.xop.follow.urls";
@@ -388,14 +392,27 @@ public final class AttachmentUtil {
static String getHeader(Map> headers, String h,
String delim) {
return getHeaderValue(headers.get(h), delim);
}
-public static Attachment createAttachment(InputStream stream, Map> headers)
-throws IOException {
+
+/**
+ * @deprecated use createAttachment(InputStream stream, Map> headers, Message message)
+ */
+public static Attachment createAttachment(InputStream stream, Map> headers)
+throws IOException {
+return createAttachment(stream, headers, null /* no Message */);
+}
+
+public static Attachment createAttachment(InputStream stream, Map> headers, Message message)
+throws IOException {
String id = cleanContentId(getHeader(headers, "Content-ID"));
AttachmentImpl att = new AttachmentImpl(id);
-final String ct = getHeader(headers, "Content-Type");
+String ct = getHeader(headers, "Content-Type");
+if (StringUtils.isEmpty(ct)) {
+ct = MessageUtils.getContextualString(message,
ATTACHMENT_CONTENT_TYPE, "application/octet-stream");
+}
+
String cd = getHeader(headers, "Content-Disposition");
String fileName
[cxf] branch 3.4.x-fixes updated (0e5236eb40 -> 7726b5f8fb)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 0e5236eb40 Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153) new 62fc36d08e CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078) new 5e657afdd4 Fixed checkstyle violations new 7726b5f8fb Recording .gitmergeinfo Changes The 3 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 | 5 + .../cxf/attachment/AttachmentDataSource.java | 6 +- .../cxf/attachment/AttachmentDeserializer.java | 2 +- .../org/apache/cxf/attachment/AttachmentUtil.java | 23 - .../java/org/apache/cxf/message/MessageUtils.java | 12 +++ .../cxf/attachment/AttachmentDeserializerTest.java | 101 + .../apache/cxf/jaxrs/ext/MessageContextImpl.java | 3 +- .../security/wss4j/AttachmentCallbackHandler.java | 14 ++- 8 files changed, 157 insertions(+), 9 deletions(-)
[cxf] 03/03: Recording .gitmergeinfo Changes
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 dbafe3ab26e4d87ebfa2c8fc4f7cc2534db032a6 Author: Andriy Redko AuthorDate: Sat Mar 4 16:06:11 2023 -0500 Recording .gitmergeinfo Changes --- .gitmergeinfo | 4 1 file changed, 4 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 5a02789e77..01dbe46c44 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -29,6 +29,7 @@ B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4 B 3795fbc8740c882d8f276b6e9cbaf0cab107edef B 38582a2b8d91502cd598029104b0f87c0255d86c B 399a35267366297a4e2b9e7e8c53972edfa24591 +B 3b1c2fe16231f7844969981d92132464a9f99452 B 3c0bc31cf4f6c754c21115b83c846ca17548817d B 3e7d45d5ff4b026dcea4e6a8196f6534750c9acd B 44919916b3747beb059cadd95a34e0bf15202a0d @@ -181,11 +182,13 @@ M 60e202dde133752bdf2de35bb8b0ca3dda6113fa M 62cb388e44976da22a5beba8791cc331abcb867a M 62d728e7acdfc213eb461daf4dfb020855b2eb36 M 6492db36e2a282e334e0b5304c1c8348ead826a2 +M 656c9459ae97e56039a77e581122e56699ea2127 M 659a083f2ff7e20df40f4e92e3aa2fed93b54ffc M 6ae75647f08feeec514f343845d9f394d7fa5553 M 6d00f9b2ca2f7fa6936fb3868e7e29594bbc70d6 M 6ea9ff22de288343f78f73e44f47983888cbf0b2 M 719c96a310c0afa62d430588cf38e77523080fa2 +M 72d28bbf1d9f39d93f0503aeefd5eed6ef38c816 M 7375465024d468ef63fce0133a093b6ea55cd813 M 74e0559ac8a2333e25a75f0cbf11bff2567b84d5 M 7501891ee05153ba43eab3cdadccf789dd15de1e @@ -205,6 +208,7 @@ M 901da059d3d23b9956d937ae3fdbcbb81c62eb75 M 9031457c538ccfe133357ab039afb2a013a2fe82 M 905f4f91e4d0b5c4d145729f16bad90b1847f0be M 937d6ca1fad9e39fa9684ea62c924b461b57d177 +M 94fdc50f4436b6a14a2e2c22a615cf710b2cabef M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158 M 97dc25412eac3342f643ea5faa38c9718d2139bf M 980ebec9b4e3cb99c0386ba3c795cad21e924ac7
[cxf] 01/03: CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078)
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 8ddf1331bab97b07bc40cd1486fbf0196b33688f
Author: Andriy Redko
AuthorDate: Sat Mar 4 11:49:19 2023 -0500
CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078)
(cherry picked from commit 5b32eaf34f5a233d0ad8c69d82b30b4ba10eecb6)
(cherry picked from commit aaf798079d1504dcd64d0685e84a011c4410adb3)
---
.../cxf/attachment/AttachmentDataSource.java | 6 +-
.../cxf/attachment/AttachmentDeserializer.java | 2 +-
.../org/apache/cxf/attachment/AttachmentUtil.java | 23 -
.../java/org/apache/cxf/message/MessageUtils.java | 12 +++
.../cxf/attachment/AttachmentDeserializerTest.java | 101 +
.../apache/cxf/jaxrs/ext/MessageContextImpl.java | 3 +-
.../security/wss4j/AttachmentCallbackHandler.java | 13 ++-
7 files changed, 151 insertions(+), 9 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index a10c6821bc..7d7939b055 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -32,7 +32,6 @@ import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
public class AttachmentDataSource implements DataSource {
-
private String ct;
private CachedOutputStream cache;
private InputStream ins;
@@ -78,9 +77,10 @@ public class AttachmentDataSource implements DataSource {
public String getContentType() {
if (StringUtils.isEmpty(ct)) {
-ct = "application/octet-stream";
+return "application/octet-stream";
+} else {
+return ct;
}
-return ct;
}
public InputStream getInputStream() {
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 55a1dcc63b..4b2ddea4e9 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -324,7 +324,7 @@ public class AttachmentDeserializer {
this);
createCount++;
-return AttachmentUtil.createAttachment(partStream, headers);
+return AttachmentUtil.createAttachment(partStream, headers, message);
}
public boolean isLazyLoading() {
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 7ff0734645..e0eaf88213 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -66,6 +66,10 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
public final class AttachmentUtil {
+// The default values for {@link AttachmentDataSource} content type in
case when
+// "Content-Type" header is not present.
+public static final String ATTACHMENT_CONTENT_TYPE =
"org.apache.cxf.attachment.content-type";
+
// The xop:include "href" attribute
(https://www.w3.org/TR/xop10/#xop_href) may include
// arbitrary URL which we should never follow (unless explicitly allowed).
public static final String ATTACHMENT_XOP_FOLLOW_URLS_PROPERTY =
"org.apache.cxf.attachment.xop.follow.urls";
@@ -394,14 +398,27 @@ public final class AttachmentUtil {
static String getHeader(Map> headers, String h,
String delim) {
return getHeaderValue(headers.get(h), delim);
}
-public static Attachment createAttachment(InputStream stream, Map> headers)
-throws IOException {
+
+/**
+ * @deprecated use createAttachment(InputStream stream, Map> headers, Message message)
+ */
+public static Attachment createAttachment(InputStream stream, Map> headers)
+throws IOException {
+return createAttachment(stream, headers, null /* no Message */);
+}
+
+public static Attachment createAttachment(InputStream stream, Map> headers, Message message)
+throws IOException {
String id = cleanContentId(getHeader(headers, "Content-ID"));
AttachmentImpl att = new AttachmentImpl(id);
-final String ct = getHeader(headers, "Content-Type");
+String ct = getHeader(headers, "Content-Type");
+if (StringUtils.isEmpty(ct)) {
+ct = MessageUtils.getContextualString(message,
ATTACHMENT_CONTENT_TYPE, "application/octet-stream");
+}
+
String cd = getHeader(headers, "Content-Disposition");
String fileName = getContentDispositionFileName(cd);
diff --git
[cxf] branch 3.5.x-fixes updated (162e2d8eb8 -> dbafe3ab26)
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 162e2d8eb8 Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153) new 8ddf1331ba CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078) new a849e0b1a7 Fixed checkstyle violations new dbafe3ab26 Recording .gitmergeinfo Changes The 3 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 | 4 + .../cxf/attachment/AttachmentDataSource.java | 6 +- .../cxf/attachment/AttachmentDeserializer.java | 2 +- .../org/apache/cxf/attachment/AttachmentUtil.java | 23 - .../java/org/apache/cxf/message/MessageUtils.java | 12 +++ .../cxf/attachment/AttachmentDeserializerTest.java | 101 + .../apache/cxf/jaxrs/ext/MessageContextImpl.java | 3 +- .../security/wss4j/AttachmentCallbackHandler.java | 14 ++- 8 files changed, 156 insertions(+), 9 deletions(-)
[cxf] 02/03: Fixed checkstyle violations
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 a849e0b1a7b2db15e045a9624c5a84174e39b35a
Author: Andriy Redko
AuthorDate: Sat Mar 4 15:12:29 2023 -0500
Fixed checkstyle violations
(cherry picked from commit 15f1c34250d39b413032f03488cda13467a0cbdc)
---
.../org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
index b0ecd34200..6f99f58e45 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
@@ -56,7 +56,8 @@ public class AttachmentCallbackHandler implements
CallbackHandler {
message.setAttachments(new ArrayList());
}
attachments = message.getAttachments();
-defaultMimeType = MessageUtils.getContextualString(message,
AttachmentUtil.ATTACHMENT_CONTENT_TYPE, "application/octet-stream");
+defaultMimeType = MessageUtils.getContextualString(message,
AttachmentUtil.ATTACHMENT_CONTENT_TYPE,
+"application/octet-stream");
}
public
AttachmentCallbackHandler(Collection
attachments) {
[cxf] branch 3.6.x-fixes updated: Fixed checkstyle violations
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 15f1c34250 Fixed checkstyle violations
15f1c34250 is described below
commit 15f1c34250d39b413032f03488cda13467a0cbdc
Author: Andriy Redko
AuthorDate: Sat Mar 4 15:12:29 2023 -0500
Fixed checkstyle violations
---
.../org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
index b0ecd34200..6f99f58e45 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
@@ -56,7 +56,8 @@ public class AttachmentCallbackHandler implements
CallbackHandler {
message.setAttachments(new ArrayList());
}
attachments = message.getAttachments();
-defaultMimeType = MessageUtils.getContextualString(message,
AttachmentUtil.ATTACHMENT_CONTENT_TYPE, "application/octet-stream");
+defaultMimeType = MessageUtils.getContextualString(message,
AttachmentUtil.ATTACHMENT_CONTENT_TYPE,
+"application/octet-stream");
}
public
AttachmentCallbackHandler(Collection
attachments) {
[cxf] 01/02: CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit aaf798079d1504dcd64d0685e84a011c4410adb3
Author: Andriy Redko
AuthorDate: Sat Mar 4 11:49:19 2023 -0500
CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078)
(cherry picked from commit 5b32eaf34f5a233d0ad8c69d82b30b4ba10eecb6)
---
.../cxf/attachment/AttachmentDataSource.java | 6 +-
.../cxf/attachment/AttachmentDeserializer.java | 2 +-
.../org/apache/cxf/attachment/AttachmentUtil.java | 23 -
.../java/org/apache/cxf/message/MessageUtils.java | 12 +++
.../cxf/attachment/AttachmentDeserializerTest.java | 101 +
.../apache/cxf/jaxrs/ext/MessageContextImpl.java | 3 +-
.../security/wss4j/AttachmentCallbackHandler.java | 13 ++-
7 files changed, 151 insertions(+), 9 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index a10c6821bc..7d7939b055 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -32,7 +32,6 @@ import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
public class AttachmentDataSource implements DataSource {
-
private String ct;
private CachedOutputStream cache;
private InputStream ins;
@@ -78,9 +77,10 @@ public class AttachmentDataSource implements DataSource {
public String getContentType() {
if (StringUtils.isEmpty(ct)) {
-ct = "application/octet-stream";
+return "application/octet-stream";
+} else {
+return ct;
}
-return ct;
}
public InputStream getInputStream() {
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 2cd5472e3a..7827b8d501 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -326,7 +326,7 @@ public class AttachmentDeserializer {
this);
createCount++;
-return AttachmentUtil.createAttachment(partStream, headers);
+return AttachmentUtil.createAttachment(partStream, headers, message);
}
public boolean isLazyLoading() {
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 7ff0734645..e0eaf88213 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -66,6 +66,10 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
public final class AttachmentUtil {
+// The default values for {@link AttachmentDataSource} content type in
case when
+// "Content-Type" header is not present.
+public static final String ATTACHMENT_CONTENT_TYPE =
"org.apache.cxf.attachment.content-type";
+
// The xop:include "href" attribute
(https://www.w3.org/TR/xop10/#xop_href) may include
// arbitrary URL which we should never follow (unless explicitly allowed).
public static final String ATTACHMENT_XOP_FOLLOW_URLS_PROPERTY =
"org.apache.cxf.attachment.xop.follow.urls";
@@ -394,14 +398,27 @@ public final class AttachmentUtil {
static String getHeader(Map> headers, String h,
String delim) {
return getHeaderValue(headers.get(h), delim);
}
-public static Attachment createAttachment(InputStream stream, Map> headers)
-throws IOException {
+
+/**
+ * @deprecated use createAttachment(InputStream stream, Map> headers, Message message)
+ */
+public static Attachment createAttachment(InputStream stream, Map> headers)
+throws IOException {
+return createAttachment(stream, headers, null /* no Message */);
+}
+
+public static Attachment createAttachment(InputStream stream, Map> headers, Message message)
+throws IOException {
String id = cleanContentId(getHeader(headers, "Content-ID"));
AttachmentImpl att = new AttachmentImpl(id);
-final String ct = getHeader(headers, "Content-Type");
+String ct = getHeader(headers, "Content-Type");
+if (StringUtils.isEmpty(ct)) {
+ct = MessageUtils.getContextualString(message,
ATTACHMENT_CONTENT_TYPE, "application/octet-stream");
+}
+
String cd = getHeader(headers, "Content-Disposition");
String fileName = getContentDispositionFileName(cd);
diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
[cxf] branch 3.6.x-fixes updated (d8030d394f -> 3b1c2fe162)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from d8030d394f Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153) new aaf798079d CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078) new 3b1c2fe162 Recording .gitmergeinfo Changes 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: .gitmergeinfo | 7 ++ .../cxf/attachment/AttachmentDataSource.java | 6 +- .../cxf/attachment/AttachmentDeserializer.java | 2 +- .../org/apache/cxf/attachment/AttachmentUtil.java | 23 - .../java/org/apache/cxf/message/MessageUtils.java | 12 +++ .../cxf/attachment/AttachmentDeserializerTest.java | 101 + .../apache/cxf/jaxrs/ext/MessageContextImpl.java | 3 +- .../security/wss4j/AttachmentCallbackHandler.java | 13 ++- 8 files changed, 158 insertions(+), 9 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 3b1c2fe16231f7844969981d92132464a9f99452 Author: Andriy Redko AuthorDate: Sat Mar 4 11:51:04 2023 -0500 Recording .gitmergeinfo Changes --- .gitmergeinfo | 7 +++ 1 file changed, 7 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 1a71176846..f20763e72a 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -89,7 +89,9 @@ M 1b078aa212ee17050bad33dc7d6f61b22785afad M 1e4658323353b57ab3b7f07bc0ac1951256b8ac7 M 1e5445765ab5a7dd2f9d017d59e5642ac09f6ec3 M 1e58759273b90bd7666cf5cb8bc2c688b62271a1 +M 1e83992bd870ee82572fcdd540d134fc1b9390f1 M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b +M 1ee1c8fa5321a06d7814707c2e350742f34e92fb M 1ff9472aed179c1dbb36c2cbfb96a742ade7c54e M 2068929ab7277b8c1d9dcd5609838185f2e734e9 M 2083c29ed066576be424b99b57dfea9cdd90c581 @@ -146,6 +148,7 @@ M 57fc08eb5ce64641b01504747eb277898bd9c47f M 594a3bd6741e18d83ee02eb07c9b1cfd3e1dce52 M 59bd624dabd116f069ea69e039237c29e0af2c0c M 5af87bddb070ddd14c56bb3e764a831b32b5e456 +M 5b32eaf34f5a233d0ad8c69d82b30b4ba10eecb6 M 5c37d05ec7a26a9e72c5169b1f427087cf123993 M 6039ff0c0075637f0fa1687036b053b78a5eca9a M 60e202dde133752bdf2de35bb8b0ca3dda6113fa @@ -183,6 +186,7 @@ M 8cba83cdbb6a1b0d28f6fd7e218b342a42305963 M 8f4d3d46413666d07c903ef622fb617b1be1385f M 8ffec0eb10eab9894ea62152e1e6f3eb962beca9 M 905f4f91e4d0b5c4d145729f16bad90b1847f0be +M 9155af11145a456646249d05178cc3ef67ecd072 M 96a2e7f27fde6ebdffd511ce69120adfff7b9dcb M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158 M 98be30e6813d3c9f6e49c4a21c5ca7e46fada082 @@ -202,6 +206,7 @@ M a75bc16c1f3d8d41fe0ef8aa49cb007773fd6c44 M a79b210719d6b0388dc56761b12c609d4d5f6a8a M a80493b626b985c32e8b66d94bc0d117014ff4f4 M a903a5392b3cd2b5925c6afa46f289b3b94a694a +M a9438b0670eb23561497bbed9558d295a6da8ce1 M a94ed6dc52110c214e8ca36bfab9e52496494bf2 M a9a32266a14c3956186a63e408d8d75c2f47bb0f M aa71878c22711f7880ac14e8733fa1e2364f @@ -211,6 +216,7 @@ M b15e3580e8f8692b2ffd51e6b2c44ce9dd8a5730 M b207c718e84bed8120bb114f1d79f575094c3a14 M b2ee30f1728dba63ebf27b2bbae2836d633ccb42 M b4f5181ac1fddaf0276b4564e4cf6e9f6140bbd0 +M b546325057f0baac221d0f2a535ef1ee8c0956f7 M b601438552968563aa740d9586889391b9f890bb M b67138f8caece4c98e3c44437409d4be4d3801da M b6e3ab83a37cfb777d6eebf9711e552027bde37a @@ -258,6 +264,7 @@ M e628555f18f3bb82fc1f29f04cbf293dd0ad8175 M e6cbcec142d36ac8e4c58b719bdffe906df266a7 M e82ef169d1a61334e6a410c554a7c72ab92d756d M e88b6f5d0f6f1a40311317ed18f204073ac66556 +M ea012b527e5fac40dc2245705232d7cfd16e11da M ec6d7253edf1f33decd2c2accefc98fa3bb8dc60 M ec9a65c12886611620d06a402f85d98e7936d66d M ed102a26c22b5376ace2951d508485457f1f606b
[cxf] branch main updated: CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 5b32eaf34f CXF-8669: Multipart annotation not working 3.4.6 onwards
(#1078)
5b32eaf34f is described below
commit 5b32eaf34f5a233d0ad8c69d82b30b4ba10eecb6
Author: Andriy Redko
AuthorDate: Sat Mar 4 11:49:19 2023 -0500
CXF-8669: Multipart annotation not working 3.4.6 onwards (#1078)
---
.../cxf/attachment/AttachmentDataSource.java | 6 +-
.../cxf/attachment/AttachmentDeserializer.java | 2 +-
.../org/apache/cxf/attachment/AttachmentUtil.java | 23 -
.../java/org/apache/cxf/message/MessageUtils.java | 12 +++
.../cxf/attachment/AttachmentDeserializerTest.java | 101 +
.../apache/cxf/jaxrs/ext/MessageContextImpl.java | 3 +-
.../security/wss4j/AttachmentCallbackHandler.java | 13 ++-
7 files changed, 151 insertions(+), 9 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index 8fc76cdb06..2e013144e7 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -31,7 +31,6 @@ import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
public class AttachmentDataSource implements DataSource {
-
private String ct;
private CachedOutputStream cache;
private InputStream ins;
@@ -77,9 +76,10 @@ public class AttachmentDataSource implements DataSource {
public String getContentType() {
if (StringUtils.isEmpty(ct)) {
-ct = "application/octet-stream";
+return "application/octet-stream";
+} else {
+return ct;
}
-return ct;
}
public InputStream getInputStream() {
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index a6c18572a4..9782c8be11 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -325,7 +325,7 @@ public class AttachmentDeserializer {
this);
createCount++;
-return AttachmentUtil.createAttachment(partStream, headers);
+return AttachmentUtil.createAttachment(partStream, headers, message);
}
public boolean isLazyLoading() {
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index e585d26ca1..a8859cb7f0 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -65,6 +65,10 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
public final class AttachmentUtil {
+// The default values for {@link AttachmentDataSource} content type in
case when
+// "Content-Type" header is not present.
+public static final String ATTACHMENT_CONTENT_TYPE =
"org.apache.cxf.attachment.content-type";
+
// The xop:include "href" attribute
(https://www.w3.org/TR/xop10/#xop_href) may include
// arbitrary URL which we should never follow (unless explicitly allowed).
public static final String ATTACHMENT_XOP_FOLLOW_URLS_PROPERTY =
"org.apache.cxf.attachment.xop.follow.urls";
@@ -393,14 +397,27 @@ public final class AttachmentUtil {
static String getHeader(Map> headers, String h,
String delim) {
return getHeaderValue(headers.get(h), delim);
}
-public static Attachment createAttachment(InputStream stream, Map> headers)
-throws IOException {
+
+/**
+ * @deprecated use createAttachment(InputStream stream, Map> headers, Message message)
+ */
+public static Attachment createAttachment(InputStream stream, Map> headers)
+throws IOException {
+return createAttachment(stream, headers, null /* no Message */);
+}
+
+public static Attachment createAttachment(InputStream stream, Map> headers, Message message)
+throws IOException {
String id = cleanContentId(getHeader(headers, "Content-ID"));
AttachmentImpl att = new AttachmentImpl(id);
-final String ct = getHeader(headers, "Content-Type");
+String ct = getHeader(headers, "Content-Type");
+if (StringUtils.isEmpty(ct)) {
+ct = MessageUtils.getContextualString(message,
ATTACHMENT_CONTENT_TYPE, "application/octet-stream");
+}
+
String cd = getHeader(headers, "Content-Disposition");
String fileName = getContentDispositionFileName(cd);
diff
[cxf] 04/04: Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 0e5236eb40a63f5bce3ba930746a1dac64fe196b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Feb 24 06:17:09 2023 + Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153) Bumps [dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 7.4.4 to 8.1.0. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v7.4.4...v8.1.0) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6947980eda..8b03830d88 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.8 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -7.4.4 +8.1.0
[cxf] 03/04: Bump actions/cache from 3.2.5 to 3.2.6 (#1152)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c646e8d8fbde97180b2030673f73c5f8a3ad76ec
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Feb 24 06:16:54 2023 +
Bump actions/cache from 3.2.5 to 3.2.6 (#1152)
Bumps [actions/cache](https://github.com/actions/cache) from 3.2.5 to 3.2.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
-
[Commits](https://github.com/actions/cache/compare/6998d139ddd3e68c71e9e398d8e40b71a2f39812...69d9d449aced6a2ede0bc19182fadc3a0a42d2b0)
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql-analysis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 9bdf6851d5..17ef51644a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,7 +36,7 @@ jobs:
# a pull request then we can checkout the head.
fetch-depth: 2
- name: Cache local Maven repository
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3.2.5
+ uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
[cxf] branch 3.4.x-fixes updated (7f3fa88b6f -> 0e5236eb40)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 7f3fa88b6f Bump jruby from 1.7.27 to 9.4.1.0 (#1144) new c247dcebbf Bump assertj-core from 3.23.1 to 3.24.2 (#1156) new 5c23074c7f Bump github/codeql-action from 2.2.4 to 2.2.5 (#1155) new c646e8d8fb Bump actions/cache from 3.2.5 to 3.2.6 (#1152) new 0e5236eb40 Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153) 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: .github/workflows/codeql-analysis.yml | 6 +++--- parent/pom.xml| 2 +- pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
[cxf] 02/04: Bump github/codeql-action from 2.2.4 to 2.2.5 (#1155)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5c23074c7f7c3e20f554fc0378a3c785d2dc3ec3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Feb 27 07:25:03 2023 +
Bump github/codeql-action from 2.2.4 to 2.2.5 (#1155)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from
2.2.4 to 2.2.5.
- [Release notes](https://github.com/github/codeql-action/releases)
-
[Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/github/codeql-action/compare/17573ee1cc1b9d061760f3a006fc4aac4f944fd5...32dc499307d133bb5085bae78498c0ac2cf762d5)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql-analysis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 861704e1ab..9bdf6851d5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -49,7 +49,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5
# v2.2.4
+ uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5
# v2.2.5
with:
languages: ${{ matrix.language }}
#config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -77,4 +77,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses:
github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+ uses:
github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2.2.5
[cxf] 01/04: Bump assertj-core from 3.23.1 to 3.24.2 (#1156)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit c247dcebbf4bcb01eb3fb3cde692f5178f4da5e0 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Mar 3 08:03:39 2023 -0500 Bump assertj-core from 3.23.1 to 3.24.2 (#1156) Bumps assertj-core from 3.23.1 to 3.24.2. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index db893c3ccd..a368b7f21d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -85,7 +85,7 @@ 1.1.14.Final 2.0.1.Final 1.9.19 -3.23.1 +3.24.2 [2.4,3.0) 2.6.1 1.69
[cxf] 04/04: Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153)
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 162e2d8eb874dff6ebc7f12f3ca4d6ca070a407e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Feb 24 06:17:09 2023 + Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153) Bumps [dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 7.4.4 to 8.1.0. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v7.4.4...v8.1.0) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 816d393ce3..1f7d402cfa 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.8 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -7.4.4 +8.1.0
[cxf] 03/04: Bump actions/cache from 3.2.5 to 3.2.6 (#1152)
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 ba9e27540ac2b27d9746f2ef18bb171d7ecef090
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Feb 24 06:16:54 2023 +
Bump actions/cache from 3.2.5 to 3.2.6 (#1152)
Bumps [actions/cache](https://github.com/actions/cache) from 3.2.5 to 3.2.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
-
[Commits](https://github.com/actions/cache/compare/6998d139ddd3e68c71e9e398d8e40b71a2f39812...69d9d449aced6a2ede0bc19182fadc3a0a42d2b0)
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql-analysis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 98b76d93ed..b03e43a047 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,7 +36,7 @@ jobs:
# a pull request then we can checkout the head.
fetch-depth: 2
- name: Cache local Maven repository
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3.2.5
+ uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
[cxf] branch 3.5.x-fixes updated (a05acf795b -> 162e2d8eb8)
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 a05acf795b Removing old Jackson version from CXF JAX-RS archetype (#1149) new a55336a2c9 Bump assertj-core from 3.23.1 to 3.24.2 (#1156) new 9471f57ae6 Bump github/codeql-action from 2.2.4 to 2.2.5 (#1155) new ba9e27540a Bump actions/cache from 3.2.5 to 3.2.6 (#1152) new 162e2d8eb8 Bump dependency-check-maven from 7.4.4 to 8.1.0 (#1153) 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: .github/workflows/codeql-analysis.yml | 6 +++--- parent/pom.xml| 2 +- pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
[cxf] 02/04: Bump github/codeql-action from 2.2.4 to 2.2.5 (#1155)
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 9471f57ae654ba33e7febd2c78312b02cf8f6e63
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Feb 27 07:25:03 2023 +
Bump github/codeql-action from 2.2.4 to 2.2.5 (#1155)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from
2.2.4 to 2.2.5.
- [Release notes](https://github.com/github/codeql-action/releases)
-
[Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/github/codeql-action/compare/17573ee1cc1b9d061760f3a006fc4aac4f944fd5...32dc499307d133bb5085bae78498c0ac2cf762d5)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql-analysis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 4eb0963401..98b76d93ed 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -49,7 +49,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5
# v2.2.4
+ uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5
# v2.2.5
with:
languages: ${{ matrix.language }}
#config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -77,4 +77,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses:
github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+ uses:
github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2.2.5
[cxf] 01/04: Bump assertj-core from 3.23.1 to 3.24.2 (#1156)
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 a55336a2c9f0fb63dff468e56ccd3debb63d0e44 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Mar 3 08:03:39 2023 -0500 Bump assertj-core from 3.23.1 to 3.24.2 (#1156) Bumps assertj-core from 3.23.1 to 3.24.2. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 50e7a7d31f..c77337e8f3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -85,7 +85,7 @@ 1.1.14.Final 2.0.1.Final 1.9.19 -3.23.1 +3.24.2 [2.4,3.0) 2.6.1 1.70
