(cxf) branch 3.6.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.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 75adf4aa92 Recording .gitmergeinfo Changes 75adf4aa92 is described below commit 75adf4aa92c76f9cf5ecc61a5ea40e31e446e704 Author: Colm O hEigeartaigh AuthorDate: Tue Jul 16 10:42:32 2024 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 4 1 file changed, 4 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 3ef8739194..da2852757f 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -86,6 +86,7 @@ B 60aa618e06d0bbaadd7bc65d3cd3503673e53a6b B 60f00a123ee85f6865e24ee35a91e4ec6eced62c B 6266242cb5e720efdd0add51842ea953376494f9 B 62726aec4d9b70547d948dd17974e95d101b2311 +B 630d7368e073d379227d48ff4797c23377dc5ebf B 634758b2e0352a489e39cb96c9b834369fcb444f B 647408469988d9e244086efc839b2f6ab5e42cd7 B 64d861dd27daa09363144f5b6d0de367dd369ae1 @@ -108,12 +109,15 @@ B 7f683ba748e2133af0f93f1d77df5921b4e86011 B 83d19ef010183e53c5bbdecd14316dfe9fd09c3a B 8433b2bbf6eedc177aa537e4a4058505220e019c B 853facf141d74ccce985926063ed12d3a9d5 +B 86a43b9f4074521307baf5f247c9f4d1769b4d89 B 89a19d577262ac534cf2c0f03ef6776b27903dbc +B 8c7c5e7aa4021fb8c1ef117bdfb9a3740b70b5f4 B 8cc04ad0808d8ef3e062a9345cc0ef7698e8d089 B 8d07a7698748190367bc81faa6b67396eae42b5b B 8dbb29c3ff09f320c90da5af1e74bb79e66b1328 B 8e53636903d430a72e4fb98aa07a6359eb509901 B 8f7c9dae610cd708b5e17828b58b642a5485b9cc +B 93c6c1b86f35ba856144c62cb28eaab3aebccf1f B 95ce55cf1d7a405c209d3a858a82b4279f24bd91 B 9723e32190d3a820e0eecf19177561155399c867 B 98fee994fc05cf2d6a563f995aeaae4f25e54d35
(cxf) 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 4.0.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 8c7c5e7aa4021fb8c1ef117bdfb9a3740b70b5f4 Author: Colm O hEigeartaigh AuthorDate: Tue Jul 16 10:41:54 2024 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index df59eaa9b6..00f9c16668 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -85,6 +85,7 @@ M c662d7feabf74310c33aad3dd57b28bb650d36ce M c9b3b07adac650679bb3539e18b0c556ce687b28 M cbb76ba80791779b3bdc163c0762812947181f97 M cc06da466dfe5f6293843f677b961c03dee997fb +M d1b00ae6b906c7511a176e50775e97a7d9f043cc M d5cbaed0117b679a2b4c391278720183ca090861 M d77fd08202c101e7e1228162666b291604397aa4 M d92da9e9682716e0a725085df477d7b9ec9177e0
(cxf) branch 4.0.x-fixes updated (b6b479c7fa -> 8c7c5e7aa4)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 4.0.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from b6b479c7fa CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK new 86a43b9f40 Updatonig Artemis to 2.35.0 (#1967) new 8c7c5e7aa4 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 | 1 + parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
(cxf) 01/02: Updatonig Artemis to 2.35.0 (#1967)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 4.0.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 86a43b9f4074521307baf5f247c9f4d1769b4d89 Author: Colm O hEigeartaigh AuthorDate: Tue Jul 16 10:07:51 2024 +0100 Updatonig Artemis to 2.35.0 (#1967) (cherry picked from commit d1b00ae6b906c7511a176e50775e97a7d9f043cc) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5183a0cf5f..3150c7afdc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -88,7 +88,7 @@ [2,3) -2.31.2 +2.35.0 2.12.3 1.8.0.Final 3.0.0.Final
(cxf) branch coheigea/artemis deleted (was b6ee97aefc)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/artemis in repository https://gitbox.apache.org/repos/asf/cxf.git was b6ee97aefc Updatonig Artemis to 2.35.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) branch main updated: Updatonig Artemis to 2.35.0 (#1967)
This is an automated email from the ASF dual-hosted git repository. coheigea 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 d1b00ae6b9 Updatonig Artemis to 2.35.0 (#1967) d1b00ae6b9 is described below commit d1b00ae6b906c7511a176e50775e97a7d9f043cc Author: Colm O hEigeartaigh AuthorDate: Tue Jul 16 10:07:51 2024 +0100 Updatonig Artemis to 2.35.0 (#1967) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6a9ca23e43..5ef005ca1c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -87,7 +87,7 @@ [2,3) -2.31.2 +2.35.0 2.12.3 1.8.0.Final 3.0.2.Final
(cxf) branch coheigea/artemis created (now b6ee97aefc)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/artemis in repository https://gitbox.apache.org/repos/asf/cxf.git at b6ee97aefc Updatonig Artemis to 2.35.0 This branch includes the following new commits: new b6ee97aefc Updatonig Artemis to 2.35.0 The 1 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.
(cxf) 01/01: Updatonig Artemis to 2.35.0
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/artemis in repository https://gitbox.apache.org/repos/asf/cxf.git commit b6ee97aefc0a92de2e016a6cb261bf7b27b305eb Author: Colm O hEigeartaigh AuthorDate: Mon Jul 15 15:10:01 2024 +0100 Updatonig Artemis to 2.35.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6a9ca23e43..5ef005ca1c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -87,7 +87,7 @@ [2,3) -2.31.2 +2.35.0 2.12.3 1.8.0.Final 3.0.2.Final
(cxf) branch coheigea/derby deleted (was 2e8660b6fa)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/derby in repository https://gitbox.apache.org/repos/asf/cxf.git was 2e8660b6fa Updating Derby to fix CVE The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) 01/01: Updating Derby to fix CVE
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/derby in repository https://gitbox.apache.org/repos/asf/cxf.git commit 2e8660b6fa8dbdf04af987ca3405f998310c2b1f Author: Colm O hEigeartaigh AuthorDate: Mon Jul 15 14:39:13 2024 +0100 Updating Derby to fix CVE --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6a9ca23e43..528e6835f9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -106,7 +106,7 @@ 3.14.0 1.2 1.10.0 -10.16.1.1 +10.16.1.2 2.1.4 3.2.6 4.2.26
(cxf) branch coheigea/derby created (now 2e8660b6fa)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/derby in repository https://gitbox.apache.org/repos/asf/cxf.git at 2e8660b6fa Updating Derby to fix CVE This branch includes the following new commits: new 2e8660b6fa Updating Derby to fix CVE The 1 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.
(cxf) branch 3.6.x-fixes updated (0effb7da4c -> da85ef6bfa)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 0effb7da4c Recording .gitmergeinfo Changes new 2d2baa3455 Put a max default configurable limit on the Jose P2C parameter (#1793) new da85ef6bfa 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 | 1 + .../cxf/rs/security/jose/common/JoseConstants.java | 5 .../apache/cxf/rs/security/jose/jwe/JweUtils.java | 5 +++- .../jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java | 15 ++ .../security/jose/jwe/JwePbeHmacAesWrapTest.java | 34 ++ 5 files changed, 59 insertions(+), 1 deletion(-)
(cxf) 01/02: Put a max default configurable limit on the Jose P2C parameter (#1793)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2d2baa3455db7439bf1ed4e00edfc5a7106edf7d
Author: Colm O hEigeartaigh
AuthorDate: Fri Apr 5 18:47:55 2024 +0100
Put a max default configurable limit on the Jose P2C parameter (#1793)
(cherry picked from commit d1d77c34c199c2c87ebcfe23e3c81dccfe2e2473)
---
.../cxf/rs/security/jose/common/JoseConstants.java | 5
.../apache/cxf/rs/security/jose/jwe/JweUtils.java | 5 +++-
.../jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java | 15 ++
.../security/jose/jwe/JwePbeHmacAesWrapTest.java | 34 ++
4 files changed, 58 insertions(+), 1 deletion(-)
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
index 48d5cbc8b0..092581d3fd 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
@@ -192,6 +192,11 @@ public final class JoseConstants extends
RSSecurityConstants {
*/
public static final String RSSEC_ENCRYPTION_PBES2_COUNT =
"rs.security.encryption.pbes2.count";
+/**
+ * The max value for the "p2c" (PBES2 count) Header Parameter used for
decryption. The default is 1_000_000.
+ */
+public static final String RSSEC_DECRYPTION_MAX_PBES2_COUNT =
"rs.security.decryption.max.pbes2.count";
+
//
// JWT specific configuration
//
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index cefad52f5a..67d6cb6af3 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
@@ -568,7 +568,10 @@ public final class JweUtils {
if (password == null) {
throw new
JweException(JweException.Error.KEY_DECRYPTION_FAILURE);
}
-keyDecryptionProvider = new
PbesHmacAesWrapKeyDecryptionAlgorithm(new String(password));
+int pbes2Count = MessageUtils.getContextualInteger(m,
+JoseConstants.RSSEC_DECRYPTION_MAX_PBES2_COUNT, 1_000_000);
+
+keyDecryptionProvider = new
PbesHmacAesWrapKeyDecryptionAlgorithm(new String(password), pbes2Count);
} else {
PrivateKey privateKey = KeyManagementUtils.loadPrivateKey(m,
props, KeyOperation.DECRYPT);
if (keyAlgo == null) {
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
index 505049bba7..fcf00beeb8 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
@@ -26,10 +26,15 @@ import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
public class PbesHmacAesWrapKeyDecryptionAlgorithm implements
KeyDecryptionProvider {
private final byte[] password;
private final KeyAlgorithm algo;
+private final int maxPbesCount;
public PbesHmacAesWrapKeyDecryptionAlgorithm(String password) {
this(password, KeyAlgorithm.PBES2_HS256_A128KW, false);
}
+public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, int
maxPbesCount) {
+this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password),
KeyAlgorithm.PBES2_HS256_A128KW,
+false, maxPbesCount);
+}
public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, KeyAlgorithm
algo, boolean hashLargePasswords) {
this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password),
algo, hashLargePasswords);
}
@@ -43,15 +48,25 @@ public class PbesHmacAesWrapKeyDecryptionAlgorithm
implements KeyDecryptionProvi
this(password, KeyAlgorithm.PBES2_HS256_A128KW, false);
}
public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, KeyAlgorithm
algo, boolean hashLargePasswords) {
+this(password, algo, hashLargePasswords, 1_000_000);
+}
+
+public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, KeyAlgorithm
algo, boolean hashLargePasswords,
+int maxPbesC
(cxf) 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit da85ef6bfa43640ba576ff61acfd95ee31bda077 Author: Colm O hEigeartaigh AuthorDate: Fri Apr 5 18:48:44 2024 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index ed7a8876a3..24003770f2 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -828,6 +828,7 @@ M cfbe112430e477d8c2d5e4ed8e6285ffdc99f415 M d01b80120c02dbedf67ee595e3c0503df7f71b9d M d06c9ece5dbb55cfd444f31668b9d49b9089ef1b M d1c6789ba3b82faedf324e19702289cb0d655d7b +M d1d77c34c199c2c87ebcfe23e3c81dccfe2e2473 M d26294e7f6a011101ec76bc707255899b7539755 M d26b74bd9ca6bd5b9fda7c0de32ff4a2773959d2 M d2ec150230d2d4e016706d3ad9a7f6eb5b649323
(cxf) branch coheigea/jose-p2c deleted (was 75d3ee09dc)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/jose-p2c in repository https://gitbox.apache.org/repos/asf/cxf.git was 75d3ee09dc Put a max default configurable limit on the Jose P2C parameter The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) branch main updated: Put a max default configurable limit on the Jose P2C parameter (#1793)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 d1d77c34c1 Put a max default configurable limit on the Jose P2C
parameter (#1793)
d1d77c34c1 is described below
commit d1d77c34c199c2c87ebcfe23e3c81dccfe2e2473
Author: Colm O hEigeartaigh
AuthorDate: Fri Apr 5 18:47:55 2024 +0100
Put a max default configurable limit on the Jose P2C parameter (#1793)
---
.../cxf/rs/security/jose/common/JoseConstants.java | 5
.../apache/cxf/rs/security/jose/jwe/JweUtils.java | 5 +++-
.../jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java | 15 ++
.../security/jose/jwe/JwePbeHmacAesWrapTest.java | 34 ++
4 files changed, 58 insertions(+), 1 deletion(-)
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
index 48d5cbc8b0..092581d3fd 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
@@ -192,6 +192,11 @@ public final class JoseConstants extends
RSSecurityConstants {
*/
public static final String RSSEC_ENCRYPTION_PBES2_COUNT =
"rs.security.encryption.pbes2.count";
+/**
+ * The max value for the "p2c" (PBES2 count) Header Parameter used for
decryption. The default is 1_000_000.
+ */
+public static final String RSSEC_DECRYPTION_MAX_PBES2_COUNT =
"rs.security.decryption.max.pbes2.count";
+
//
// JWT specific configuration
//
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index cefad52f5a..67d6cb6af3 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
@@ -568,7 +568,10 @@ public final class JweUtils {
if (password == null) {
throw new
JweException(JweException.Error.KEY_DECRYPTION_FAILURE);
}
-keyDecryptionProvider = new
PbesHmacAesWrapKeyDecryptionAlgorithm(new String(password));
+int pbes2Count = MessageUtils.getContextualInteger(m,
+JoseConstants.RSSEC_DECRYPTION_MAX_PBES2_COUNT, 1_000_000);
+
+keyDecryptionProvider = new
PbesHmacAesWrapKeyDecryptionAlgorithm(new String(password), pbes2Count);
} else {
PrivateKey privateKey = KeyManagementUtils.loadPrivateKey(m,
props, KeyOperation.DECRYPT);
if (keyAlgo == null) {
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
index 505049bba7..fcf00beeb8 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
@@ -26,10 +26,15 @@ import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
public class PbesHmacAesWrapKeyDecryptionAlgorithm implements
KeyDecryptionProvider {
private final byte[] password;
private final KeyAlgorithm algo;
+private final int maxPbesCount;
public PbesHmacAesWrapKeyDecryptionAlgorithm(String password) {
this(password, KeyAlgorithm.PBES2_HS256_A128KW, false);
}
+public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, int
maxPbesCount) {
+this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password),
KeyAlgorithm.PBES2_HS256_A128KW,
+false, maxPbesCount);
+}
public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, KeyAlgorithm
algo, boolean hashLargePasswords) {
this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password),
algo, hashLargePasswords);
}
@@ -43,15 +48,25 @@ public class PbesHmacAesWrapKeyDecryptionAlgorithm
implements KeyDecryptionProvi
this(password, KeyAlgorithm.PBES2_HS256_A128KW, false);
}
public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, KeyAlgorithm
algo, boolean hashLargePasswords) {
+this(password, algo, hashLargePasswords, 1_000_000);
+}
+
+public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, KeyAlgorithm
al
(cxf) 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 34eb23731627402cfc4d7ead4ab37d8e6e398f76 Author: Colm O hEigeartaigh AuthorDate: Fri Apr 5 15:25:00 2024 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 248e93c7d8..e39134585b 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -24,6 +24,7 @@ B 0c9f103d1697561b3c077aac73f242981bd43c8f B 0d7fee252e18fe544cf54244d6638c9a30a32bd6 B 0da7f36a16fe1bcbcd9b2a64d0bfe2c19d5c319c B 0e9ba6cfe143f156721d6f8a1fd38d84946b5e8d +B 0effb7da4c2848ff8bd7b91eca6c249b01eb4d5a B 0fd59b2a26240e290fdc646decc4c5c467875f62 B 10c14830cf25e286917af9dd6f4da67af012dda5 B 1279d3d05b2533365b8e98b0bf211f1424e3f712
(cxf) branch 3.5.x-fixes updated (059d8c7a72 -> 34eb237316)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 059d8c7a72 Recording .gitmergeinfo Changes new 48f5c02daf [CXF-8999] KerberosTokenTest testKerberosViaCustomTokenAction should not run on IBM Java (#1792) new 34eb237316 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 | 1 + .../apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 4 2 files changed, 5 insertions(+)
(cxf) 01/02: [CXF-8999] KerberosTokenTest testKerberosViaCustomTokenAction should not run on IBM Java (#1792)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 48f5c02daf201adc352df0537f39aab30a9bd72e
Author: Jamie Goodyear
AuthorDate: Fri Apr 5 11:50:05 2024 -0230
[CXF-8999] KerberosTokenTest testKerberosViaCustomTokenAction should not
run on IBM Java (#1792)
(cherry picked from commit 64aca434d8dcda0161509b7611b7a4c19c23b24c)
---
.../apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 4
1 file changed, 4 insertions(+)
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index 17b59045b5..91d55de257 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -396,6 +396,10 @@ public class KerberosTokenTest extends
AbstractBusClientServerTestBase {
@org.junit.Test
public void testKerberosViaCustomTokenAction() throws Exception {
+if (!runTests) {
+return;
+}
+
SpringBusFactory bf = new SpringBusFactory();
URL busFile = KerberosTokenTest.class.getResource("client.xml");
(cxf) branch 3.6.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.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 0effb7da4c Recording .gitmergeinfo Changes 0effb7da4c is described below commit 0effb7da4c2848ff8bd7b91eca6c249b01eb4d5a Author: Colm O hEigeartaigh AuthorDate: Fri Apr 5 15:21:31 2024 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 1eac11e8c1..ed7a8876a3 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -269,6 +269,7 @@ M 1b078aa212ee17050bad33dc7d6f61b22785afad M 1ba515ec4125aa0f104a251a7b4f386400fa0d95 M 1c17991a4b6ae93a4634583919692ff3da483c81 M 1cab5596a0bf99e111c238030349325636cfeca2 +M 1d61fa26cd6663e35955b569d87cca6b2dc6ff40 M 1d92d5abc7913e0ef77f234ee0200d4b0e72ca85 M 1dd5d810b8ae7d13aef2d7138950aea224943913 M 1df1109f1884abc390d8d5c635f95785c666a242 @@ -811,6 +812,7 @@ M c91d62bfe90c493c7db9de2d40515f4b0ef6c482 M c95efd4bafcd8cca67804b74d133604727786803 M ca0ec620534ae915230815f324f0c0df313e6f5f M ca46bebe06bc2732907e476bfe6116f09fbe1eb4 +M ca8b225331f15278767bd77f0efb0fdc300f0eb4 M cb00226811f39d36b4f91106be94fd889c426005 M cb64c848003e2aa12ab8f12f34c6d0314495617e M cd2218e5327360b9784dfeb8dae0ca6a9faa2b41
(cxf) branch 3.6.x-fixes updated: [CXF-8999] KerberosTokenTest testKerberosViaCustomTokenAction should not run on IBM Java (#1792)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 64aca434d8 [CXF-8999] KerberosTokenTest
testKerberosViaCustomTokenAction should not run on IBM Java (#1792)
64aca434d8 is described below
commit 64aca434d8dcda0161509b7611b7a4c19c23b24c
Author: Jamie Goodyear
AuthorDate: Fri Apr 5 11:50:05 2024 -0230
[CXF-8999] KerberosTokenTest testKerberosViaCustomTokenAction should not
run on IBM Java (#1792)
---
.../apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 4
1 file changed, 4 insertions(+)
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index 17b59045b5..91d55de257 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -396,6 +396,10 @@ public class KerberosTokenTest extends
AbstractBusClientServerTestBase {
@org.junit.Test
public void testKerberosViaCustomTokenAction() throws Exception {
+if (!runTests) {
+return;
+}
+
SpringBusFactory bf = new SpringBusFactory();
URL busFile = KerberosTokenTest.class.getResource("client.xml");
(cxf) branch main updated: [CXF-8999] KerberosTokenTest testKerberosViaCustomTokenAction should not run on IBM Java (#1792)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 86314d6a2d [CXF-8999] KerberosTokenTest
testKerberosViaCustomTokenAction should not run on IBM Java (#1792)
86314d6a2d is described below
commit 86314d6a2d599783a3878085e6dba7e6f761ea68
Author: Jamie Goodyear
AuthorDate: Fri Apr 5 11:50:05 2024 -0230
[CXF-8999] KerberosTokenTest testKerberosViaCustomTokenAction should not
run on IBM Java (#1792)
---
.../apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 4
1 file changed, 4 insertions(+)
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index 04f60a5231..50878effd1 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -396,6 +396,10 @@ public class KerberosTokenTest extends
AbstractBusClientServerTestBase {
@org.junit.Test
public void testKerberosViaCustomTokenAction() throws Exception {
+if (!runTests) {
+return;
+}
+
SpringBusFactory bf = new SpringBusFactory();
URL busFile = KerberosTokenTest.class.getResource("client.xml");
(cxf) 01/01: Put a max default configurable limit on the Jose P2C parameter
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/jose-p2c
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 75d3ee09dc7109f463d4e0ee31d29932eabd9d6b
Author: Colm O hEigeartaigh
AuthorDate: Fri Apr 5 14:16:09 2024 +0100
Put a max default configurable limit on the Jose P2C parameter
---
.../cxf/rs/security/jose/common/JoseConstants.java | 5
.../apache/cxf/rs/security/jose/jwe/JweUtils.java | 5 +++-
.../jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java | 15 ++
.../security/jose/jwe/JwePbeHmacAesWrapTest.java | 34 ++
4 files changed, 58 insertions(+), 1 deletion(-)
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
index 48d5cbc8b0..092581d3fd 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java
@@ -192,6 +192,11 @@ public final class JoseConstants extends
RSSecurityConstants {
*/
public static final String RSSEC_ENCRYPTION_PBES2_COUNT =
"rs.security.encryption.pbes2.count";
+/**
+ * The max value for the "p2c" (PBES2 count) Header Parameter used for
decryption. The default is 1_000_000.
+ */
+public static final String RSSEC_DECRYPTION_MAX_PBES2_COUNT =
"rs.security.decryption.max.pbes2.count";
+
//
// JWT specific configuration
//
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index cefad52f5a..67d6cb6af3 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
@@ -568,7 +568,10 @@ public final class JweUtils {
if (password == null) {
throw new
JweException(JweException.Error.KEY_DECRYPTION_FAILURE);
}
-keyDecryptionProvider = new
PbesHmacAesWrapKeyDecryptionAlgorithm(new String(password));
+int pbes2Count = MessageUtils.getContextualInteger(m,
+JoseConstants.RSSEC_DECRYPTION_MAX_PBES2_COUNT, 1_000_000);
+
+keyDecryptionProvider = new
PbesHmacAesWrapKeyDecryptionAlgorithm(new String(password), pbes2Count);
} else {
PrivateKey privateKey = KeyManagementUtils.loadPrivateKey(m,
props, KeyOperation.DECRYPT);
if (keyAlgo == null) {
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
index 505049bba7..fcf00beeb8 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
@@ -26,10 +26,15 @@ import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
public class PbesHmacAesWrapKeyDecryptionAlgorithm implements
KeyDecryptionProvider {
private final byte[] password;
private final KeyAlgorithm algo;
+private final int maxPbesCount;
public PbesHmacAesWrapKeyDecryptionAlgorithm(String password) {
this(password, KeyAlgorithm.PBES2_HS256_A128KW, false);
}
+public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, int
maxPbesCount) {
+this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password),
KeyAlgorithm.PBES2_HS256_A128KW,
+false, maxPbesCount);
+}
public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, KeyAlgorithm
algo, boolean hashLargePasswords) {
this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password),
algo, hashLargePasswords);
}
@@ -43,15 +48,25 @@ public class PbesHmacAesWrapKeyDecryptionAlgorithm
implements KeyDecryptionProvi
this(password, KeyAlgorithm.PBES2_HS256_A128KW, false);
}
public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, KeyAlgorithm
algo, boolean hashLargePasswords) {
+this(password, algo, hashLargePasswords, 1_000_000);
+}
+
+public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, KeyAlgorithm
algo, boolean hashLargePasswords,
+int maxPbesCount) {
this.password =
PbesHmacAesWrapKeyEncryptionAlgorithm.validatePassword(password,
algo.ge
(cxf) branch coheigea/jose-p2c created (now 75d3ee09dc)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/jose-p2c in repository https://gitbox.apache.org/repos/asf/cxf.git at 75d3ee09dc Put a max default configurable limit on the Jose P2C parameter This branch includes the following new commits: new 75d3ee09dc Put a max default configurable limit on the Jose P2C parameter The 1 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.
svn commit: r68116 - in /release/cxf/fediz: 1.6.1/ 1.6.2/
Author: coheigea Date: Mon Mar 25 09:28:54 2024 New Revision: 68116 Log: Adding Fediz 1.6.2 release Added: release/cxf/fediz/1.6.2/ release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip (with props) release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip.asc release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip.sha512 release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip (with props) release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip.asc release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip.sha512 Removed: release/cxf/fediz/1.6.1/ Added: release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip == Binary file - no diff available. Propchange: release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip -- svn:mime-type = application/octet-stream Added: release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip.asc == --- release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip.asc (added) +++ release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip.asc Mon Mar 25 09:28:54 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE20Xs0ZuXUU9ycQWuZ7+AsQrVOYMFAmX8BsYACgkQZ7+AsQrV +OYMLJAf+MMgEyF52wsDQ+bEZ35ML9vb9nnOfJTAyqLj29ewDXzDMFp6iWSU48f5t +4ny5oSD4m+M6ASye6eUeSf6zFNYtwEEirIvVUB7mv5USzNfkuhDgwWqKIKenCOLM +2zambfEN7DBiJYOhCheNCBT7HydErtnaYQNiSTx2rrk6N8xcpH6qTD+29vgzwE5S +/aE/YrcyD9DFeSIFpr4SEY1Zj9QmP42SCriPNDvFFypo2SaFD11IuO2hDgWwfjZl +6GyjFlv4id4o2Qjg9kskAQh3/GXQcRyuYkkaok9VLqa81IzgXnN7IGnFkf6Iri17 +G5ROA+oERULOeeRigIoRl7d/ONQ+UQ== +=pMOo +-END PGP SIGNATURE- Added: release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip.sha512 == --- release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip.sha512 (added) +++ release/cxf/fediz/1.6.2/apache-fediz-1.6.2.zip.sha512 Mon Mar 25 09:28:54 2024 @@ -0,0 +1 @@ +fb8114048471a8658eb029bc45018eeb3afe5b4c3b32607f472a10935d023d2f7e7f33f209ddacb037d34e831ec102a2a422161be88b71bece04a05beea7b1e1 apache-fediz-1.6.2.zip Added: release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip == Binary file - no diff available. Propchange: release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip -- svn:mime-type = application/octet-stream Added: release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip.asc == --- release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip.asc (added) +++ release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip.asc Mon Mar 25 09:28:54 2024 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE20Xs0ZuXUU9ycQWuZ7+AsQrVOYMFAmX7++EACgkQZ7+AsQrV +OYNLIwf+JY+kC0chvCsUwUEE6Mz0go0NG4PZXQD+VW/dwfCVFGGSqPVJXfZ08+rD +xUXZNfrqnGmMrkZMeqPbpkeS2v3vFQYL75IzygHviudZeaXlrREMI+LJEGwoRdMo +0N/7hY0jWnSrnkzepRyPzNykrHHRZjPYBAm8kxQ6SzdCXsLFRIe5/R3wVLGTHgjH +Dr1PxAAtqeoZErN7WlDhnBWOss2ByxPprkcHNly3ft09DkE7LqX0Tro6jH1t5lKW +5xDOR8GuQTbG+aK95Oh8Y2StdOrlwYcTdbujBGk8pAdPcyMVx19FIUkARaKozASQ +0CFMu0BndLXnUpIeIItkLYtmZXeEjw== +=Xf4j +-END PGP SIGNATURE- Added: release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip.sha512 == --- release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip.sha512 (added) +++ release/cxf/fediz/1.6.2/fediz-1.6.2-source-release.zip.sha512 Mon Mar 25 09:28:54 2024 @@ -0,0 +1 @@ +28a9e404e5d791bff360255dfae7dd61252bc99df46fbfad3bc959d76fcfced2963dc46840e7369e27ece0eca5bbe29fd668b359f3c0a66b42392f574c3a6169 fediz-1.6.2-source-release.zip
svn commit: r68115 - in /release/cxf: 3.4.10/ 3.5.6/ 3.5.7/ 3.6.1/ 3.6.2/ 4.0.0/ 4.0.2/ 4.0.3/
Author: coheigea Date: Mon Mar 25 08:37:08 2024 New Revision: 68115 Log: Removing old releases Removed: release/cxf/3.4.10/ release/cxf/3.5.6/ release/cxf/3.5.7/ release/cxf/3.6.1/ release/cxf/3.6.2/ release/cxf/4.0.0/ release/cxf/4.0.2/ release/cxf/4.0.3/
(cxf-fediz) branch main updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git The following commit(s) were added to refs/heads/main by this push: new cbde5fc2 [maven-release-plugin] prepare for next development iteration cbde5fc2 is described below commit cbde5fc26fa388b9fb7508c6c663260d39fafab5 Author: Colm O hEigeartaigh AuthorDate: Thu Mar 21 09:19:57 2024 + [maven-release-plugin] prepare for next development iteration --- apache-fediz/pom.xml | 4 ++-- examples/jaxrsCxfPluginWebapp/pom.xml | 2 +- examples/jaxrsSimpleWebapp/pom.xml | 2 +- examples/jaxrsSpringSecurityWebapp/pom.xml | 2 +- examples/pom.xml | 2 +- examples/simpleWebapp/pom.xml | 2 +- examples/springPreauthWebapp/pom.xml | 2 +- examples/springWebapp/pom.xml | 2 +- examples/wsclientWebapp/pom.xml| 2 +- examples/wsclientWebapp/webapp/pom.xml | 2 +- examples/wsclientWebapp/webservice/common/pom.xml | 2 +- examples/wsclientWebapp/webservice/pom.xml | 2 +- examples/wsclientWebapp/webservice/service/pom.xml | 2 +- plugins/core/pom.xml | 2 +- plugins/cxf/pom.xml| 2 +- plugins/jetty9/pom.xml | 2 +- plugins/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/tomcat/pom.xml | 2 +- pom.xml| 6 +++--- services/idp-core/pom.xml | 2 +- services/idp/pom.xml | 2 +- services/oidc/pom.xml | 2 +- services/pom.xml | 2 +- services/sts/pom.xml | 2 +- systests/custom/pom.xml| 2 +- systests/cxf/pom.xml | 2 +- systests/federation/oidcIdpWebapp/pom.xml | 2 +- systests/federation/pom.xml| 2 +- systests/federation/samlIdpWebapp/pom.xml | 2 +- systests/federation/samlWebapp/pom.xml | 2 +- systests/federation/samlsso/pom.xml| 2 +- systests/federation/unknown-subject/pom.xml| 2 +- systests/federation/wsfed/pom.xml | 2 +- systests/idp/pom.xml | 2 +- systests/jetty9/pom.xml| 2 +- systests/kerberos/pom.xml | 2 +- systests/ldap/pom.xml | 2 +- systests/oidc/pom.xml | 2 +- systests/pom.xml | 2 +- systests/samlsso/pom.xml | 2 +- systests/spring/pom.xml| 2 +- systests/tests/pom.xml | 2 +- systests/tomcat/pom.xml| 2 +- systests/webapps/cxfWebapp/pom.xml | 2 +- systests/webapps/pom.xml | 2 +- systests/webapps/simpleWebapp/pom.xml | 2 +- systests/webapps/springPreauthWebapp/pom.xml | 2 +- systests/webapps/springWebapp/pom.xml | 2 +- 49 files changed, 52 insertions(+), 52 deletions(-) diff --git a/apache-fediz/pom.xml b/apache-fediz/pom.xml index 3d0b3be2..766d39b3 100644 --- a/apache-fediz/pom.xml +++ b/apache-fediz/pom.xml @@ -22,14 +22,14 @@ 4.0.0 org.apache.cxf.fediz apache-fediz -1.6.2 +1.6.3-SNAPSHOT Apache Fediz Assembly pom org.apache.cxf.fediz fediz -1.6.2 +1.6.3-SNAPSHOT diff --git a/examples/jaxrsCxfPluginWebapp/pom.xml b/examples/jaxrsCxfPluginWebapp/pom.xml index 246b35c0..028a2b11 100644 --- a/examples/jaxrsCxfPluginWebapp/pom.xml +++ b/examples/jaxrsCxfPluginWebapp/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.fediz examples -1.6.2 +1.6.3-SNAPSHOT org.apache.cxf.fediz.examples jaxrsCxfPluginWebapp diff --git a/examples/jaxrsSimpleWebapp/pom.xml b/examples/jaxrsSimpleWebapp/pom.xml index 633970df..10c5ba93 100644 --- a/examples/jaxrsSimpleWebapp/pom.xml +++ b/examples/jaxrsSimpleWebapp/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.fediz examples -1.6.2 +1.6.3-SNAPSHOT org.apache.cxf.fediz.examples jaxrsSimpleWebapp diff --git a/examples/jaxrsSpringSecurityWebapp/pom.xml b/examples/jaxrsSpringSecurityWebapp/pom.xml index 841b86b4..3da1d765 100644 --- a/examples/jaxrsSpringSecurityWebapp/pom.xml +++ b/examples/jaxrsSpringSecurityWebapp/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.fediz examples -1.6.2 +1.6.3-SNAPSHOT
(cxf-fediz) annotated tag fediz-1.6.2 created (now a4301970)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to annotated tag fediz-1.6.2 in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git at a4301970 (tag) tagging 9301be560acbaf0d53336a23d1112248d903e4c4 (commit) replaces fediz-1.6.1 by Colm O hEigeartaigh on Thu Mar 21 09:19:45 2024 + - Log - [maven-release-plugin] copy for tag fediz-1.6.2 --- No new revisions were added by this update.
(cxf-fediz) branch main updated: [maven-release-plugin] prepare release fediz-1.6.2
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git The following commit(s) were added to refs/heads/main by this push: new 9301be56 [maven-release-plugin] prepare release fediz-1.6.2 9301be56 is described below commit 9301be560acbaf0d53336a23d1112248d903e4c4 Author: Colm O hEigeartaigh AuthorDate: Thu Mar 21 09:18:36 2024 + [maven-release-plugin] prepare release fediz-1.6.2 --- apache-fediz/pom.xml | 4 ++-- examples/jaxrsCxfPluginWebapp/pom.xml | 2 +- examples/jaxrsSimpleWebapp/pom.xml | 2 +- examples/jaxrsSpringSecurityWebapp/pom.xml | 2 +- examples/pom.xml | 2 +- examples/simpleWebapp/pom.xml | 2 +- examples/springPreauthWebapp/pom.xml | 2 +- examples/springWebapp/pom.xml | 2 +- examples/wsclientWebapp/pom.xml| 2 +- examples/wsclientWebapp/webapp/pom.xml | 2 +- examples/wsclientWebapp/webservice/common/pom.xml | 2 +- examples/wsclientWebapp/webservice/pom.xml | 2 +- examples/wsclientWebapp/webservice/service/pom.xml | 2 +- plugins/core/pom.xml | 2 +- plugins/cxf/pom.xml| 2 +- plugins/jetty9/pom.xml | 2 +- plugins/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/tomcat/pom.xml | 2 +- pom.xml| 6 +++--- services/idp-core/pom.xml | 2 +- services/idp/pom.xml | 2 +- services/oidc/pom.xml | 2 +- services/pom.xml | 2 +- services/sts/pom.xml | 2 +- systests/custom/pom.xml| 2 +- systests/cxf/pom.xml | 2 +- systests/federation/oidcIdpWebapp/pom.xml | 2 +- systests/federation/pom.xml| 2 +- systests/federation/samlIdpWebapp/pom.xml | 2 +- systests/federation/samlWebapp/pom.xml | 2 +- systests/federation/samlsso/pom.xml| 2 +- systests/federation/unknown-subject/pom.xml| 2 +- systests/federation/wsfed/pom.xml | 2 +- systests/idp/pom.xml | 2 +- systests/jetty9/pom.xml| 2 +- systests/kerberos/pom.xml | 2 +- systests/ldap/pom.xml | 2 +- systests/oidc/pom.xml | 2 +- systests/pom.xml | 2 +- systests/samlsso/pom.xml | 2 +- systests/spring/pom.xml| 2 +- systests/tests/pom.xml | 2 +- systests/tomcat/pom.xml| 2 +- systests/webapps/cxfWebapp/pom.xml | 2 +- systests/webapps/pom.xml | 2 +- systests/webapps/simpleWebapp/pom.xml | 2 +- systests/webapps/springPreauthWebapp/pom.xml | 2 +- systests/webapps/springWebapp/pom.xml | 2 +- 49 files changed, 52 insertions(+), 52 deletions(-) diff --git a/apache-fediz/pom.xml b/apache-fediz/pom.xml index 7f68bc36..3d0b3be2 100644 --- a/apache-fediz/pom.xml +++ b/apache-fediz/pom.xml @@ -22,14 +22,14 @@ 4.0.0 org.apache.cxf.fediz apache-fediz -1.6.2-SNAPSHOT +1.6.2 Apache Fediz Assembly pom org.apache.cxf.fediz fediz -1.6.2-SNAPSHOT +1.6.2 diff --git a/examples/jaxrsCxfPluginWebapp/pom.xml b/examples/jaxrsCxfPluginWebapp/pom.xml index 8a6eebf2..246b35c0 100644 --- a/examples/jaxrsCxfPluginWebapp/pom.xml +++ b/examples/jaxrsCxfPluginWebapp/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.fediz examples -1.6.2-SNAPSHOT +1.6.2 org.apache.cxf.fediz.examples jaxrsCxfPluginWebapp diff --git a/examples/jaxrsSimpleWebapp/pom.xml b/examples/jaxrsSimpleWebapp/pom.xml index 31bdb74b..633970df 100644 --- a/examples/jaxrsSimpleWebapp/pom.xml +++ b/examples/jaxrsSimpleWebapp/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.fediz examples -1.6.2-SNAPSHOT +1.6.2 org.apache.cxf.fediz.examples jaxrsSimpleWebapp diff --git a/examples/jaxrsSpringSecurityWebapp/pom.xml b/examples/jaxrsSpringSecurityWebapp/pom.xml index beb381f0..841b86b4 100644 --- a/examples/jaxrsSpringSecurityWebapp/pom.xml +++ b/examples/jaxrsSpringSecurityWebapp/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.fediz examples -1.6.2-SNAPSHOT +1.6.2
(cxf-fediz) branch main updated (ad50c694 -> 78f96a43)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from ad50c694 Merge pull request #264 from apache/dependabot/maven/org.apache.cxf-cxf-xjc-plugin-3.3.3 add 06ef9406 Updating CXF to 3.5.8 new 78f96a43 Merge pull request #265 from apache/coheigea/cxf-3.5.8 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch coheigea/cxf-3.5.8 deleted (was 06ef9406)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/cxf-3.5.8 in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git was 06ef9406 Updating CXF to 3.5.8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf-fediz) 01/01: Merge pull request #265 from apache/coheigea/cxf-3.5.8
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit 78f96a430cfb6c23249862b368b082f5c622e97d Merge: ad50c694 06ef9406 Author: Colm O hEigeartaigh AuthorDate: Tue Mar 19 13:22:18 2024 + Merge pull request #265 from apache/coheigea/cxf-3.5.8 Updating CXF to 3.5.8 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) 01/01: Updating CXF to 3.5.8
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/cxf-3.5.8 in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit 06ef9406a729370110fd24f479232c1ae080203b Author: Colm O hEigeartaigh AuthorDate: Tue Mar 19 13:00:02 2024 + Updating CXF to 3.5.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13e8696f..b402578b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 1.2 1.11.0 1.8.0 -3.5.7 +3.5.8 3.4.4 5.2.0 3.9.11
(cxf-fediz) branch coheigea/cxf-3.5.8 created (now 06ef9406)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/cxf-3.5.8 in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git at 06ef9406 Updating CXF to 3.5.8 This branch includes the following new commits: new 06ef9406 Updating CXF to 3.5.8 The 1 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.
(cxf-fediz) 01/01: Merge pull request #264 from apache/dependabot/maven/org.apache.cxf-cxf-xjc-plugin-3.3.3
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit ad50c694932bf8c02858caf00fc2f1c0a88c9df9 Merge: d741b521 69990a3d Author: Colm O hEigeartaigh AuthorDate: Tue Mar 19 12:58:09 2024 + Merge pull request #264 from apache/dependabot/maven/org.apache.cxf-cxf-xjc-plugin-3.3.3 Bump org.apache.cxf:cxf-xjc-plugin from 3.3.2 to 3.3.3 plugins/core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (82bab008 -> d741b521)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from 82bab008 Merge pull request #262 from apache/dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin-3.7.1 add 8620eccd Bump org.apache.maven.plugins:maven-compiler-plugin add d741b521 Merge pull request #263 from apache/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.13.0 No new revisions were added by this update. Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(cxf-fediz) branch main updated (d741b521 -> ad50c694)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from d741b521 Merge pull request #263 from apache/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.13.0 add 69990a3d Bump org.apache.cxf:cxf-xjc-plugin from 3.3.2 to 3.3.3 new ad50c694 Merge pull request #264 from apache/dependabot/maven/org.apache.cxf-cxf-xjc-plugin-3.3.3 The 1 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: plugins/core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (3421e06c -> 82bab008)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from 3421e06c Merge pull request #260 from apache/dependabot/github_actions/actions/setup-java-4.2.1 add 31e34bb7 Bump org.apache.maven.plugins:maven-assembly-plugin from 3.7.0 to 3.7.1 new 82bab008 Merge pull request #262 from apache/dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin-3.7.1 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) 01/01: Merge pull request #262 from apache/dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin-3.7.1
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit 82bab0088a821bce685256dcf30eafa457a2f4b2 Merge: 3421e06c 31e34bb7 Author: Colm O hEigeartaigh AuthorDate: Tue Mar 19 12:57:46 2024 + Merge pull request #262 from apache/dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin-3.7.1 Bump org.apache.maven.plugins:maven-assembly-plugin from 3.7.0 to 3.7.1 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) 01/01: Merge pull request #260 from apache/dependabot/github_actions/actions/setup-java-4.2.1
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit 3421e06cea670fcc84797a47b58e89bb11e5a9d1 Merge: f734820f 5e3dc480 Author: Colm O hEigeartaigh AuthorDate: Mon Mar 18 18:09:03 2024 + Merge pull request #260 from apache/dependabot/github_actions/actions/setup-java-4.2.1 Bump actions/setup-java from 4.1.0 to 4.2.1 .github/workflows/pull-request-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc .github/workflows/pull-request-build.yml index 71f05c48,9d354a5c..8e2630d8 --- a/.github/workflows/pull-request-build.yml +++ b/.github/workflows/pull-request-build.yml @@@ -15,9 -15,9 +15,9 @@@ jobs pull-requests: read timeout-minutes: 130 steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - name: Set up JDK 8 - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: java-version: '8' distribution: 'temurin'
(cxf-fediz) branch main updated (f734820f -> 3421e06c)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from f734820f Merge pull request #261 from apache/dependabot/github_actions/actions/checkout-4.1.2 add 5e3dc480 Bump actions/setup-java from 4.1.0 to 4.2.1 new 3421e06c Merge pull request #260 from apache/dependabot/github_actions/actions/setup-java-4.2.1 The 1 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/pull-request-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (b362e328 -> f734820f)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from b362e328 Merge pull request #259 from apache/dependabot/maven/tomcat.version-9.0.87 add b11895ca Bump actions/checkout from 4.1.1 to 4.1.2 add f734820f Merge pull request #261 from apache/dependabot/github_actions/actions/checkout-4.1.2 No new revisions were added by this update. Summary of changes: .github/workflows/codeql.yml | 2 +- .github/workflows/pull-request-build.yml | 2 +- .github/workflows/scorecards.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(cxf) branch 3.6.x-fixes updated: Only explicitly return the stylesheet in WadlGenerator and not other URLs (#1749)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 378afe1acb Only explicitly return the stylesheet in WadlGenerator and
not other URLs (#1749)
378afe1acb is described below
commit 378afe1acb7503315bc63555c8743db0f55d8312
Author: Colm O hEigeartaigh
AuthorDate: Fri Mar 15 15:23:43 2024 +
Only explicitly return the stylesheet in WadlGenerator and not other URLs
(#1749)
(cherry picked from commit df2241c59481a57aebb1c0693b778a35baaf5570)
---
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index c3194847e8..23c0e297d6 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -242,9 +242,17 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (path.startsWith("/") && !path.isEmpty()) {
path = path.substring(1);
}
-if (stylesheetReference != null && path.endsWith(".xsl")
-|| docLocationMap.containsKey(path)) {
+
+if (docLocationMap.containsKey(path)) {
context.abortWith(getExistingResource(m, ui, path));
+} else if (stylesheetReference != null) {
+String theStylesheetReference = stylesheetReference;
+if (theStylesheetReference.startsWith("/")) {
+theStylesheetReference =
theStylesheetReference.substring(1);
+}
+if (path.endsWith(theStylesheetReference)) {
+context.abortWith(getExistingResource(m, ui,
stylesheetReference));
+}
}
}
return;
(cxf) branch coheigea/wadl-stylesheet deleted (was e80c2f243b)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/wadl-stylesheet in repository https://gitbox.apache.org/repos/asf/cxf.git was e80c2f243b Only explicitly return the stylesheet in WadlGenerator and not other URLs The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) branch main updated: Only explicitly return the stylesheet in WadlGenerator and not other URLs (#1749)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 df2241c594 Only explicitly return the stylesheet in WadlGenerator and
not other URLs (#1749)
df2241c594 is described below
commit df2241c59481a57aebb1c0693b778a35baaf5570
Author: Colm O hEigeartaigh
AuthorDate: Fri Mar 15 15:23:43 2024 +
Only explicitly return the stylesheet in WadlGenerator and not other URLs
(#1749)
---
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 16c13400a4..897a2ffbb1 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -243,9 +243,17 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (path.startsWith("/") && !path.isEmpty()) {
path = path.substring(1);
}
-if (stylesheetReference != null && path.endsWith(".xsl")
-|| docLocationMap.containsKey(path)) {
+
+if (docLocationMap.containsKey(path)) {
context.abortWith(getExistingResource(m, ui, path));
+} else if (stylesheetReference != null) {
+String theStylesheetReference = stylesheetReference;
+if (theStylesheetReference.startsWith("/")) {
+theStylesheetReference =
theStylesheetReference.substring(1);
+}
+if (path.endsWith(theStylesheetReference)) {
+context.abortWith(getExistingResource(m, ui,
stylesheetReference));
+}
}
}
return;
(cxf) branch coheigea/wadl-stylesheet updated (1dbfeee729 -> e80c2f243b)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/wadl-stylesheet in repository https://gitbox.apache.org/repos/asf/cxf.git discard 1dbfeee729 Only explicitly return the stylesheet in WadlGenerator and not other URLs add e80c2f243b Only explicitly return the stylesheet in WadlGenerator and not other URLs This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1dbfeee729) \ N -- N -- N refs/heads/coheigea/wadl-stylesheet (e80c2f243b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf) branch coheigea/wadl-stylesheet updated (d441e4ad54 -> 1dbfeee729)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/wadl-stylesheet in repository https://gitbox.apache.org/repos/asf/cxf.git discard d441e4ad54 Only explicitly return the stylesheet in WadlGenerator and not other URLs add 1dbfeee729 Only explicitly return the stylesheet in WadlGenerator and not other URLs This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d441e4ad54) \ N -- N -- N refs/heads/coheigea/wadl-stylesheet (1dbfeee729) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-)
(cxf-fediz) 01/01: Merge pull request #259 from apache/dependabot/maven/tomcat.version-9.0.87
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit b362e3284f8aadd597b56386493cf46fcb0b1cd3 Merge: c7e207e1 e6ce6f42 Author: Colm O hEigeartaigh AuthorDate: Fri Mar 15 13:32:06 2024 + Merge pull request #259 from apache/dependabot/maven/tomcat.version-9.0.87 Bump tomcat.version from 9.0.86 to 9.0.87 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (c7e207e1 -> b362e328)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from c7e207e1 Merge pull request #257 from apache/dependabot/maven/spring.version-5.3.33 add e6ce6f42 Bump tomcat.version from 9.0.86 to 9.0.87 new b362e328 Merge pull request #259 from apache/dependabot/maven/tomcat.version-9.0.87 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf) branch coheigea/wadl-stylesheet created (now d441e4ad54)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/wadl-stylesheet in repository https://gitbox.apache.org/repos/asf/cxf.git at d441e4ad54 Only explicitly return the stylesheet in WadlGenerator and not other URLs No new revisions were added by this update.
(cxf-fediz) 01/01: Merge pull request #257 from apache/dependabot/maven/spring.version-5.3.33
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit c7e207e1c43826edb2451167ee013f1f08b990ab Merge: c34e93ed ecb212a9 Author: Colm O hEigeartaigh AuthorDate: Fri Mar 15 09:25:37 2024 + Merge pull request #257 from apache/dependabot/maven/spring.version-5.3.33 Bump spring.version from 5.3.32 to 5.3.33 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (c34e93ed -> c7e207e1)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from c34e93ed Merge pull request #258 from apache/dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin-3.7.0 add ecb212a9 Bump spring.version from 5.3.32 to 5.3.33 new c7e207e1 Merge pull request #257 from apache/dependabot/maven/spring.version-5.3.33 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (38c855cc -> c34e93ed)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from 38c855cc Merge pull request #250 from apache/dependabot/maven/tomcat.version-9.0.86 add 95ca9f3f Bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.0 add c34e93ed Merge pull request #258 from apache/dependabot/maven/org.apache.maven.plugins-maven-assembly-plugin-3.7.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (02ee79b6 -> ea3a3f8e)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from 02ee79b6 Merge pull request #253 from apache/dependabot/maven/org.apache.commons-commons-dbcp2-2.12.0 add fbf5aeb0 Bump actions/setup-java from 4.0.0 to 4.1.0 add ea3a3f8e Merge pull request #252 from apache/dependabot/github_actions/actions/setup-java-4.1.0 No new revisions were added by this update. Summary of changes: .github/workflows/pull-request-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (9c86ad2e -> 02ee79b6)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from 9c86ad2e Merge pull request #255 from apache/dependabot/maven/org.apache.logging.log4j-log4j-slf4j-impl-2.23.1 add 4b97ab0b Bump org.apache.commons:commons-dbcp2 from 2.11.0 to 2.12.0 new 02ee79b6 Merge pull request #253 from apache/dependabot/maven/org.apache.commons-commons-dbcp2-2.12.0 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (f6a3bfa8 -> 9c86ad2e)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from f6a3bfa8 Merge pull request #256 from apache/dependabot/maven/com.fasterxml.jackson-jackson-bom-2.17.0 add d75bb988 Bump org.apache.logging.log4j:log4j-slf4j-impl from 2.22.1 to 2.23.1 add 9c86ad2e Merge pull request #255 from apache/dependabot/maven/org.apache.logging.log4j-log4j-slf4j-impl-2.23.1 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (ea3a3f8e -> 38c855cc)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from ea3a3f8e Merge pull request #252 from apache/dependabot/github_actions/actions/setup-java-4.1.0 add df584bb7 Bump tomcat.version from 9.0.85 to 9.0.86 add 38c855cc Merge pull request #250 from apache/dependabot/maven/tomcat.version-9.0.86 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) 01/01: Merge pull request #253 from apache/dependabot/maven/org.apache.commons-commons-dbcp2-2.12.0
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit 02ee79b644030ba20210c7f5ea8d683a67695af0 Merge: 9c86ad2e 4b97ab0b Author: Colm O hEigeartaigh AuthorDate: Thu Mar 14 10:49:47 2024 + Merge pull request #253 from apache/dependabot/maven/org.apache.commons-commons-dbcp2-2.12.0 Bump org.apache.commons:commons-dbcp2 from 2.11.0 to 2.12.0 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (0d42a312 -> f6a3bfa8)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from 0d42a312 Merge pull request #249 from apache/dependabot/maven/spring.version-5.3.32 add 5c638820 Bump com.fasterxml.jackson:jackson-bom from 2.16.1 to 2.17.0 add f6a3bfa8 Merge pull request #256 from apache/dependabot/maven/com.fasterxml.jackson-jackson-bom-2.17.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-xjc-utils) branch 3.x-fixes updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git The following commit(s) were added to refs/heads/3.x-fixes by this push: new 5bd7642 [maven-release-plugin] prepare for next development iteration 5bd7642 is described below commit 5bd7642b13571e8801b854c772be47ef17a42fd8 Author: Colm O hEigeartaigh AuthorDate: Tue Mar 12 13:20:33 2024 + [maven-release-plugin] prepare for next development iteration --- boolean-test/pom.xml | 2 +- boolean/pom.xml| 2 +- bug671/pom.xml | 2 +- bug986/pom.xml | 2 +- cxf-xjc-plugin/pom.xml | 2 +- dv-test/pom.xml| 2 +- dv/pom.xml | 2 +- javadoc/pom.xml| 2 +- pom.xml| 6 +++--- property-listener/pom.xml | 2 +- runtime/pom.xml| 2 +- ts-test/pom.xml| 2 +- ts/pom.xml | 2 +- wsdlextension-test/pom.xml | 2 +- wsdlextension/pom.xml | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml index f565d3a..d7b6031 100644 --- a/boolean-test/pom.xml +++ b/boolean-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils - 3.3.3 + 3.3.4-SNAPSHOT diff --git a/boolean/pom.xml b/boolean/pom.xml index a5ea39f..e6bc941 100644 --- a/boolean/pom.xml +++ b/boolean/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/bug671/pom.xml b/bug671/pom.xml index 3e014d1..958fd2c 100644 --- a/bug671/pom.xml +++ b/bug671/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/bug986/pom.xml b/bug986/pom.xml index 21b9a52..8bbd18e 100644 --- a/bug986/pom.xml +++ b/bug986/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml index 61e627f..1cdb0af 100644 --- a/cxf-xjc-plugin/pom.xml +++ b/cxf-xjc-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/dv-test/pom.xml b/dv-test/pom.xml index d573b46..a1ca1a1 100644 --- a/dv-test/pom.xml +++ b/dv-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/dv/pom.xml b/dv/pom.xml index ef24f8b..dff7316 100644 --- a/dv/pom.xml +++ b/dv/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/javadoc/pom.xml b/javadoc/pom.xml index c652bb9..50c5e1e 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index ee4601b..2ef7151 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.xjc-utils xjc-utils pom -3.3.3 +3.3.4-SNAPSHOT Apache CXF XJC Utils https://cxf.apache.org @@ -33,7 +33,7 @@ scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git - xjc-utils-3.3.3 + HEAD jira @@ -55,7 +55,7 @@ cxf-pmd-ruleset.xml - 2024-03-12T13:19:11Z + 2024-03-12T13:20:32Z diff --git a/property-listener/pom.xml b/property-listener/pom.xml index c6eeebc..68de98e 100644 --- a/property-listener/pom.xml +++ b/property-listener/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/runtime/pom.xml b/runtime/pom.xml index 351cef6..f4b8838 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -15,7 +15,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/ts-test/pom.xml b/ts-test/pom.xml index 6fc3fed..f694725 100644 --- a/ts-test/pom.xml +++ b/ts-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/ts/pom.xml b/ts/pom.xml index 8d66c42..5617836 100644 --- a/ts/pom.xml +++ b/ts/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.3.3 +3.3.4-SNAPSHOT diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml index b4bf396..d282420 100644 --- a/wsdlextension-test/pom.xml +++ b/wsdlextension-test/pom.xml @@ -27,7 +27,7
(cxf-xjc-utils) annotated tag xjc-utils-3.3.3 created (now 92e7e7d)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to annotated tag xjc-utils-3.3.3 in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git at 92e7e7d (tag) tagging b3f02355871a22375e7b980189d9030a810e4aff (commit) replaces xjc-utils-3.3.2 by Colm O hEigeartaigh on Tue Mar 12 13:20:25 2024 + - Log - [maven-release-plugin] copy for tag xjc-utils-3.3.3 --- No new revisions were added by this update.
(cxf-xjc-utils) branch 3.x-fixes updated: [maven-release-plugin] prepare release xjc-utils-3.3.3
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
The following commit(s) were added to refs/heads/3.x-fixes by this push:
new b3f0235 [maven-release-plugin] prepare release xjc-utils-3.3.3
b3f0235 is described below
commit b3f02355871a22375e7b980189d9030a810e4aff
Author: Colm O hEigeartaigh
AuthorDate: Tue Mar 12 13:20:09 2024 +
[maven-release-plugin] prepare release xjc-utils-3.3.3
---
boolean-test/pom.xml | 2 +-
boolean/pom.xml| 2 +-
bug671/pom.xml | 2 +-
bug986/pom.xml | 2 +-
cxf-xjc-plugin/pom.xml | 2 +-
dv-test/pom.xml| 2 +-
dv/pom.xml | 2 +-
javadoc/pom.xml| 2 +-
pom.xml| 6 +++---
property-listener/pom.xml | 2 +-
runtime/pom.xml| 2 +-
ts-test/pom.xml| 2 +-
ts/pom.xml | 2 +-
wsdlextension-test/pom.xml | 2 +-
wsdlextension/pom.xml | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml
index 7c30b0c..f565d3a 100644
--- a/boolean-test/pom.xml
+++ b/boolean-test/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
- 3.3.3-SNAPSHOT
+ 3.3.3
diff --git a/boolean/pom.xml b/boolean/pom.xml
index 51265a8..a5ea39f 100644
--- a/boolean/pom.xml
+++ b/boolean/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/bug671/pom.xml b/bug671/pom.xml
index fb5031a..3e014d1 100644
--- a/bug671/pom.xml
+++ b/bug671/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/bug986/pom.xml b/bug986/pom.xml
index 4347486..21b9a52 100644
--- a/bug986/pom.xml
+++ b/bug986/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml
index 9654009..61e627f 100644
--- a/cxf-xjc-plugin/pom.xml
+++ b/cxf-xjc-plugin/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/dv-test/pom.xml b/dv-test/pom.xml
index d07c2ef..d573b46 100644
--- a/dv-test/pom.xml
+++ b/dv-test/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/dv/pom.xml b/dv/pom.xml
index b3645f0..ef24f8b 100644
--- a/dv/pom.xml
+++ b/dv/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index 762665f..c652bb9 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/pom.xml b/pom.xml
index e0e2267..ee4601b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
org.apache.cxf.xjc-utils
xjc-utils
pom
-3.3.3-SNAPSHOT
+3.3.3
Apache CXF XJC Utils
https://cxf.apache.org
@@ -33,7 +33,7 @@
scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
- HEAD
+ xjc-utils-3.3.3
jira
@@ -55,7 +55,7 @@
cxf-pmd-ruleset.xml
-
${maven.build.timestamp}
+
2024-03-12T13:19:11Z
diff --git a/property-listener/pom.xml b/property-listener/pom.xml
index f0928bc..c6eeebc 100644
--- a/property-listener/pom.xml
+++ b/property-listener/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/runtime/pom.xml b/runtime/pom.xml
index df30397..351cef6 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -15,7 +15,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/ts-test/pom.xml b/ts-test/pom.xml
index 780026e..6fc3fed 100644
--- a/ts-test/pom.xml
+++ b/ts-test/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/ts/pom.xml b/ts/pom.xml
index b606f99..8d66c42 100644
--- a/ts/pom.xml
+++ b/ts/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-3.3.3-SNAPSHOT
+3.3.3
diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml
index 4736cb3..b4bf396 100644
--- a/wsdlextension-test/pom.xml
+++ b/wsdlextension-test/pom.xml
@@ -27,7 +27,7
(cxf-xjc-utils) branch 3.x-fixes updated (8aff34f -> b7c6501)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git from 8aff34f CXFXJC-44: cxf-xjc-dv generates compilation failure when XJC simple binding mode is used (#69) new 556decd Bump plexus-archiver from 4.2.0 to 4.6.2 new fd790bb Bump plexus-archiver from 4.6.2 to 4.6.3 (#49) new 728e68b Bump plexus-archiver from 4.6.3 to 4.7.1 (#64) new a4ade4b Bump org.codehaus.plexus:plexus-archiver in /cxf-xjc-plugin (#74) new 98709d8 Bump org.codehaus.plexus:plexus-archiver from 4.8.0 to 4.9.0 (#82) new b22782a Bump org.codehaus.plexus:plexus-archiver from 4.9.0 to 4.9.1 (#110) new 34383c2 Bump maven-plugin-annotations from 3.2 to 3.8.1 new e7e6dc7 Bump maven-plugin-annotations from 3.8.1 to 3.8.2 new 29ce9d2 Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#87) new 113d5ad Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#114) new fb7f2af Bump io from 6.0.1 to 8.9.2 (#14) new 8458806 Updating Apache parent pom to 24 new f6fb577 Bump apache from 24 to 29 (#33) new 6f0764c Bump org.apache:apache from 29 to 31 (#85) new deb86dd Bump maven-plugin-api from 3.6.3 to 3.9.1 new afec056 Bump maven-core from 3.6.3 to 3.9.0 new efdb394 Bump maven-core from 3.9.0 to 3.9.1 (#51) new 0157e25 Bump org.apache.maven:maven-core from 3.9.1 to 3.9.6 (#91) new 3c4d5d1 Bump maven-compat from 3.6.3 to 3.9.0 new e519dc2 Bump maven-compat from 3.9.0 to 3.9.1 (#50) new 100f1e3 Bump org.apache.maven:maven-compat from 3.9.1 to 3.9.6 (#88) new f7ae1d0 Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.14.0 (#103) new 1e282ac Bump org.apache.maven:maven-plugin-api from 3.9.1 to 3.9.6 (#107) new 48565a5 Bump maven-clean-plugin from 3.1.0 to 3.2.0 new 7d2ccac Bump org.apache.maven.plugins:maven-clean-plugin from 3.2.0 to 3.3.2 (#92) new 96e5b25 Bump maven-install-plugin from 2.5.2 to 3.1.0 (#41) new fb1fa91 Bump maven-install-plugin from 3.1.0 to 3.1.1 new fa6b10a Bump maven-release-plugin from 2.5.3 to 3.0.0 (#48) new 1f6c43b Bump org.apache.maven.plugins:maven-release-plugin from 3.0.0 to 3.0.1 (#93) new 67237ec Bump maven-javadoc-plugin from 3.2.0 to 3.5.0 new 78fc633 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.3 (#90) new 3862458 Bump maven-surefire-plugin from 2.22.2 to 3.0.0 (#39) new 5a5d28e Bump maven-surefire-plugin from 3.0.0 to 3.1.0 new c526c02 Bump maven-surefire-report-plugin from 3.0.0 to 3.1.0 new 4f5c2aa Bump org.apache.maven.plugins:maven-surefire-report-plugin (#96) new 40593e6 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.1.0 to 3.2.3 (#98) new 6a601a0 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#100) new 77069c7 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#113) new cf773ef Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 (#112) new 38ca9d7 Bump maven-compiler-plugin from 3.8.1 to 3.11.0 (#15) new f761476 Bump org.apache.maven.plugins:maven-compiler-plugin (#106) new cdec750 Bump org.apache.maven.plugins:maven-compiler-plugin (#108) new e96a75b Bump maven-jar-plugin from 3.2.0 to 3.3.0 new 6ad7c5c Bump maven-resources-plugin from 3.3.0 to 3.3.1 (#52) new f4989ac Bump maven-dependency-plugin from 3.1.2 to 3.5.0 (#27) new b40abdc Bump org.apache.maven.plugins:maven-dependency-plugin (#101) new 7aa8e45 Bump maven-site-plugin from 3.7.1 to 3.12.1 (#30) new 52e23d5 Bump maven-deploy-plugin from 2.8.2 to 3.1.0 (#37) new 80752e1 Bump maven-deploy-plugin from 3.1.0 to 3.1.1 (#54) new 637bf51 Bump maven-project-info-reports-plugin from 2.9 to 3.4.2 new 28614e7 Bump maven-project-info-reports-plugin from 3.4.2 to 3.4.3 new eb2a25f Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#97) new de8aff8 Bump maven-plugin-plugin from 3.6.2 to 3.8.1 new 6d70f22 Bump maven-plugin-plugin from 3.8.1 to 3.8.2 new b7f3393 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.8.2 to 3.10.2 (#95) new e942597 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.10.2 to 3.11.0 (#115) new b4e322b Bump maven-bundle-plugin from 5.1.1 to 5.1.8 (#31) new b7c6501 Bump org.apache.felix:maven-bundle-plugin from 5.1.8 to 5.1.9 (#86) The 58 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: cxf-xjc-plugin/pom.xml | 5 +++-- javadoc/pom.xml| 2 +- pom.xml| 41 +-
(cxf-xjc-utils) branch main updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git The following commit(s) were added to refs/heads/main by this push: new 7210050 [maven-release-plugin] prepare for next development iteration 7210050 is described below commit 72100504d30c64526b10af3f89face41684c2346 Author: Colm O hEigeartaigh AuthorDate: Tue Mar 12 10:48:08 2024 + [maven-release-plugin] prepare for next development iteration --- boolean-test/pom.xml | 2 +- boolean/pom.xml| 2 +- bug671/pom.xml | 2 +- bug986/pom.xml | 2 +- cxf-xjc-plugin/pom.xml | 2 +- dv-test/pom.xml| 2 +- dv/pom.xml | 2 +- javadoc/pom.xml| 2 +- pom.xml| 6 +++--- property-listener/pom.xml | 2 +- runtime/pom.xml| 2 +- ts-test/pom.xml| 2 +- ts/pom.xml | 2 +- wsdlextension-test/pom.xml | 2 +- wsdlextension/pom.xml | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml index 9241cc5..44c1281 100644 --- a/boolean-test/pom.xml +++ b/boolean-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils - 4.0.1 + 4.0.2-SNAPSHOT diff --git a/boolean/pom.xml b/boolean/pom.xml index a3fe4bc..9505351 100644 --- a/boolean/pom.xml +++ b/boolean/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/bug671/pom.xml b/bug671/pom.xml index b3b2355..c8c1e0c 100644 --- a/bug671/pom.xml +++ b/bug671/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/bug986/pom.xml b/bug986/pom.xml index 1fed54a..6b2f2df 100644 --- a/bug986/pom.xml +++ b/bug986/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml index d572005..857206a 100644 --- a/cxf-xjc-plugin/pom.xml +++ b/cxf-xjc-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/dv-test/pom.xml b/dv-test/pom.xml index 28a1f98..7990792 100644 --- a/dv-test/pom.xml +++ b/dv-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/dv/pom.xml b/dv/pom.xml index b15edc8..d759018 100644 --- a/dv/pom.xml +++ b/dv/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 749b51a..f230ebd 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index c951f51..6b26c60 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.xjc-utils xjc-utils pom -4.0.1 +4.0.2-SNAPSHOT Apache CXF XJC Utils https://cxf.apache.org @@ -33,7 +33,7 @@ scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git - xjc-utils-4.0.1 + HEAD jira @@ -55,7 +55,7 @@ cxf-pmd-ruleset.xml - 2024-03-12T10:46:41Z + 2024-03-12T10:48:08Z diff --git a/property-listener/pom.xml b/property-listener/pom.xml index 9a86d26..067e435 100644 --- a/property-listener/pom.xml +++ b/property-listener/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/runtime/pom.xml b/runtime/pom.xml index 54cbe73..cc2e2ae 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -15,7 +15,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/ts-test/pom.xml b/ts-test/pom.xml index c81a228..a924ead 100644 --- a/ts-test/pom.xml +++ b/ts-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/ts/pom.xml b/ts/pom.xml index 70a9414..26b0c05 100644 --- a/ts/pom.xml +++ b/ts/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -4.0.1 +4.0.2-SNAPSHOT diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml index ac07ec2..a8bc07d 100644 --- a/wsdlextension-test/pom.xml +++ b/wsdlextension-test/pom.xml @@ -27,7 +27,7
(cxf-xjc-utils) annotated tag xjc-utils-4.0.1 created (now 9f3861c)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to annotated tag xjc-utils-4.0.1 in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git at 9f3861c (tag) tagging e0a854f93386508f781a287019cec12f7d154142 (commit) replaces xjc-utils-4.0.0 by Colm O hEigeartaigh on Tue Mar 12 10:48:00 2024 + - Log - [maven-release-plugin] copy for tag xjc-utils-4.0.1 --- No new revisions were added by this update.
(cxf-xjc-utils) branch main updated: [maven-release-plugin] prepare release xjc-utils-4.0.1
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
The following commit(s) were added to refs/heads/main by this push:
new e0a854f [maven-release-plugin] prepare release xjc-utils-4.0.1
e0a854f is described below
commit e0a854f93386508f781a287019cec12f7d154142
Author: Colm O hEigeartaigh
AuthorDate: Tue Mar 12 10:47:44 2024 +
[maven-release-plugin] prepare release xjc-utils-4.0.1
---
boolean-test/pom.xml | 2 +-
boolean/pom.xml| 2 +-
bug671/pom.xml | 2 +-
bug986/pom.xml | 2 +-
cxf-xjc-plugin/pom.xml | 2 +-
dv-test/pom.xml| 2 +-
dv/pom.xml | 2 +-
javadoc/pom.xml| 2 +-
pom.xml| 6 +++---
property-listener/pom.xml | 2 +-
runtime/pom.xml| 2 +-
ts-test/pom.xml| 2 +-
ts/pom.xml | 2 +-
wsdlextension-test/pom.xml | 2 +-
wsdlextension/pom.xml | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml
index 99ccf8f..9241cc5 100644
--- a/boolean-test/pom.xml
+++ b/boolean-test/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
- 4.0.1-SNAPSHOT
+ 4.0.1
diff --git a/boolean/pom.xml b/boolean/pom.xml
index 53bad3a..a3fe4bc 100644
--- a/boolean/pom.xml
+++ b/boolean/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/bug671/pom.xml b/bug671/pom.xml
index 7f28bf7..b3b2355 100644
--- a/bug671/pom.xml
+++ b/bug671/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/bug986/pom.xml b/bug986/pom.xml
index 36b6b76..1fed54a 100644
--- a/bug986/pom.xml
+++ b/bug986/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml
index 82d4716..d572005 100644
--- a/cxf-xjc-plugin/pom.xml
+++ b/cxf-xjc-plugin/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/dv-test/pom.xml b/dv-test/pom.xml
index c0f95e2..28a1f98 100644
--- a/dv-test/pom.xml
+++ b/dv-test/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/dv/pom.xml b/dv/pom.xml
index e6bb6e2..b15edc8 100644
--- a/dv/pom.xml
+++ b/dv/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index fd42327..749b51a 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/pom.xml b/pom.xml
index 43098ca..c951f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
org.apache.cxf.xjc-utils
xjc-utils
pom
-4.0.1-SNAPSHOT
+4.0.1
Apache CXF XJC Utils
https://cxf.apache.org
@@ -33,7 +33,7 @@
scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
scm:git:https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git
- HEAD
+ xjc-utils-4.0.1
jira
@@ -55,7 +55,7 @@
cxf-pmd-ruleset.xml
-
${maven.build.timestamp}
+
2024-03-12T10:46:41Z
diff --git a/property-listener/pom.xml b/property-listener/pom.xml
index 3a51e0e..9a86d26 100644
--- a/property-listener/pom.xml
+++ b/property-listener/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/runtime/pom.xml b/runtime/pom.xml
index cd9c076..54cbe73 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -15,7 +15,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/ts-test/pom.xml b/ts-test/pom.xml
index aa39323..c81a228 100644
--- a/ts-test/pom.xml
+++ b/ts-test/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/ts/pom.xml b/ts/pom.xml
index 72fe2f2..70a9414 100644
--- a/ts/pom.xml
+++ b/ts/pom.xml
@@ -27,7 +27,7 @@
org.apache.cxf.xjc-utils
xjc-utils
-4.0.1-SNAPSHOT
+4.0.1
diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml
index a126dcd..ac07ec2 100644
--- a/wsdlextension-test/pom.xml
+++ b/wsdlextension-test/pom.xml
@@ -27,7 +27,7
(cxf) branch main updated: Bump actions/setup-java from 4.0.0 to 4.1.0 (#1718)
This is an automated email from the ASF dual-hosted git repository. coheigea 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 b2632fe833 Bump actions/setup-java from 4.0.0 to 4.1.0 (#1718) b2632fe833 is described below commit b2632fe833673c289273c7d163166df62037fa4c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Mar 7 13:17:01 2024 + Bump actions/setup-java from 4.0.0 to 4.1.0 (#1718) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/387ac29b308b003ca37ba93a6cab5eb57c8f5f93...9704b39bf258b59bc04b50fa2dd55e9ed76b47a8) --- updated-dependencies: - dependency-name: actions/setup-java 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> --- .github/workflows/codeql-analysis.yml| 2 +- .github/workflows/pull-request-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1597195cb9..4c2589170c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Setup JDK 17 - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml index 55750a0165..b596a403c1 100644 --- a/.github/workflows/pull-request-build.yml +++ b/.github/workflows/pull-request-build.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0 - name: Set up JDK 17 -uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 +uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: java-version: '17' distribution: 'temurin'
(cxf) branch main updated: Bump actions/cache from 4.0.0 to 4.0.1 (#1717)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 f31da17f30 Bump actions/cache from 4.0.0 to 4.0.1 (#1717)
f31da17f30 is described below
commit f31da17f304e932a42badccb091dabd523f2daac
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Mar 7 13:10:19 2024 +
Bump actions/cache from 4.0.0 to 4.0.1 (#1717)
Bumps [actions/cache](https://github.com/actions/cache) from 4.0.0 to 4.0.1.
- [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/13aacd865c20de90d75de3b17ebe84f7a17d57d2...ab5e6d0c87105b4c9c2047343972218f562e4319)
---
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 9be87f8408..1597195cb9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,7 +36,7 @@ jobs:
distribution: 'temurin'
java-version: '17'
- name: Cache local Maven repository
- uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+ uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
(cxf) 01/02: Minor cleanup of some warnings
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 611050b6692de7b4bf259ea4503fcf1f66f36a9b
Author: Daniel Kulp
AuthorDate: Wed Feb 15 15:25:45 2023 +0100
Minor cleanup of some warnings
(cherry picked from commit 692ba1273df1a64723aa1817631191afbe5ca184)
---
.../org/apache/cxf/common/util/SortedArraySet.java| 3 ++-
.../java/org/apache/cxf/message/MessageUtilsTest.java | 6 +++---
.../org/apache/cxf/aegis/type/xml/SourceType.java | 18 ++
.../org/apache/cxf/jaxb/JAXBContextInitializer.java | 1 -
.../cxf/ext/logging/MaskSensitiveHelperTest.java | 2 +-
.../interceptors/AbstractMetricsInterceptor.java | 3 +--
.../interceptors/WebFaultOutInterceptorTestCase.java | 19 +--
.../java/org/apache/cxf/wsdl/JAXBExtensionHelper.java | 3 +--
.../provider/AbstractSourcePayloadProvider.java | 7 +--
9 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
index 9891fa9908..a25b1646a1 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
@@ -231,7 +231,8 @@ public final class SortedArraySet implements
SortedSet {
@Override
public void remove() {
if (idx > 0) {
-SortedArraySet.this.remove(data[idx - 1]);
+Object o = data[idx - 1];
+SortedArraySet.this.remove(o);
}
}
}
diff --git a/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
b/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
index 243d52b821..84456a2524 100644
--- a/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
@@ -36,10 +36,10 @@ import org.apache.cxf.service.model.OperationInfo;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
public class MessageUtilsTest {
@@ -102,7 +102,7 @@ public class MessageUtilsTest {
Message message = new MessageImpl();
String key = "key1";
message.put(key, ", bbb , cc, d");
-Set contextualStrings = MessageUtils.getContextualStrings(message,
key, Collections.EMPTY_SET);
+Set contextualStrings =
MessageUtils.getContextualStrings(message, key, Collections.emptySet());
assertEquals(4, contextualStrings.size());
assertTrue(contextualStrings.remove(""));
assertTrue(contextualStrings.remove("bbb"));
@@ -114,7 +114,7 @@ public class MessageUtilsTest {
defaults.add("aaa");
defaults.add("zzz");
defaults.add("eee");
-Set contextualStringsDefault =
MessageUtils.getContextualStrings(message, "unknownKey", defaults);
+Set contextualStringsDefault =
MessageUtils.getContextualStrings(message, "unknownKey", defaults);
assertEquals(defaults, contextualStringsDefault);
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
index e6c216e839..81e9827412 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.aegis.type.xml;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -29,7 +31,6 @@ import org.w3c.dom.Element;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.DatabindingException;
@@ -100,17 +101,10 @@ public class SourceType extends AegisType {
}
}
-protected XMLReader createXMLReader() throws SAXException {
-// In JDK 1.4, the xml reader factory does not look for META-INF
-// services
-// If the org.xml.sax.driver system property is not defined, and
-// exception will be thrown.
-// In these cases, default to xerces parser
-try {
-return XMLReaderFactory.createXMLRea
(cxf) 02/02: Disallowing DTDs for Aegis SourceType (#1729)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d4c70481f9aff55511eb8e7276b0a650522d76ff
Author: Colm O hEigeartaigh
AuthorDate: Wed Mar 6 20:31:50 2024 +
Disallowing DTDs for Aegis SourceType (#1729)
(cherry picked from commit 667cf979a29782191b942747da2ae6f260101003)
(cherry picked from commit ffa87cd73b96ba2936342ddaa8ad08ef144a3bed)
---
.../aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
index 81e9827412..587fe82080 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
@@ -104,6 +104,8 @@ public class SourceType extends AegisType {
protected XMLReader createXMLReader() throws SAXException,
ParserConfigurationException {
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
+// Disable DTDs
+spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl";,
true);
return spf.newSAXParser().getXMLReader();
}
(cxf) branch 3.5.x-fixes updated (e8ef66b5ab -> d4c70481f9)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from e8ef66b5ab Recording .gitmergeinfo Changes new 611050b669 Minor cleanup of some warnings new d4c70481f9 Disallowing DTDs for Aegis SourceType (#1729) 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: .../org/apache/cxf/common/util/SortedArraySet.java | 3 ++- .../org/apache/cxf/message/MessageUtilsTest.java | 6 +++--- .../org/apache/cxf/aegis/type/xml/SourceType.java| 20 .../org/apache/cxf/jaxb/JAXBContextInitializer.java | 1 - .../cxf/ext/logging/MaskSensitiveHelperTest.java | 2 +- .../interceptors/AbstractMetricsInterceptor.java | 3 +-- .../interceptors/WebFaultOutInterceptorTestCase.java | 19 +-- .../org/apache/cxf/wsdl/JAXBExtensionHelper.java | 3 +-- .../provider/AbstractSourcePayloadProvider.java | 7 +-- 9 files changed, 30 insertions(+), 34 deletions(-)
(cxf) branch 3.6.x-fixes updated: Disallowing DTDs for Aegis SourceType (#1729)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 ffa87cd73b Disallowing DTDs for Aegis SourceType (#1729)
ffa87cd73b is described below
commit ffa87cd73b96ba2936342ddaa8ad08ef144a3bed
Author: Colm O hEigeartaigh
AuthorDate: Wed Mar 6 20:31:50 2024 +
Disallowing DTDs for Aegis SourceType (#1729)
(cherry picked from commit 667cf979a29782191b942747da2ae6f260101003)
---
.../aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
index 81e9827412..587fe82080 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
@@ -104,6 +104,8 @@ public class SourceType extends AegisType {
protected XMLReader createXMLReader() throws SAXException,
ParserConfigurationException {
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
+// Disable DTDs
+spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl";,
true);
return spf.newSAXParser().getXMLReader();
}
(cxf) branch 3.6.x-fixes updated: Minor cleanup of some warnings
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 692ba1273d Minor cleanup of some warnings
692ba1273d is described below
commit 692ba1273df1a64723aa1817631191afbe5ca184
Author: Daniel Kulp
AuthorDate: Wed Feb 15 15:25:45 2023 +0100
Minor cleanup of some warnings
---
.../org/apache/cxf/common/util/SortedArraySet.java| 3 ++-
.../java/org/apache/cxf/message/MessageUtilsTest.java | 6 +++---
.../org/apache/cxf/aegis/type/xml/SourceType.java | 18 ++
.../org/apache/cxf/jaxb/JAXBContextInitializer.java | 1 -
.../cxf/ext/logging/MaskSensitiveHelperTest.java | 2 +-
.../interceptors/AbstractMetricsInterceptor.java | 3 +--
.../interceptors/WebFaultOutInterceptorTestCase.java | 19 +--
.../java/org/apache/cxf/wsdl/JAXBExtensionHelper.java | 3 +--
.../provider/AbstractSourcePayloadProvider.java | 7 +--
9 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
index 9891fa9908..a25b1646a1 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
@@ -231,7 +231,8 @@ public final class SortedArraySet implements
SortedSet {
@Override
public void remove() {
if (idx > 0) {
-SortedArraySet.this.remove(data[idx - 1]);
+Object o = data[idx - 1];
+SortedArraySet.this.remove(o);
}
}
}
diff --git a/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
b/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
index 243d52b821..84456a2524 100644
--- a/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
@@ -36,10 +36,10 @@ import org.apache.cxf.service.model.OperationInfo;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
public class MessageUtilsTest {
@@ -102,7 +102,7 @@ public class MessageUtilsTest {
Message message = new MessageImpl();
String key = "key1";
message.put(key, ", bbb , cc, d");
-Set contextualStrings = MessageUtils.getContextualStrings(message,
key, Collections.EMPTY_SET);
+Set contextualStrings =
MessageUtils.getContextualStrings(message, key, Collections.emptySet());
assertEquals(4, contextualStrings.size());
assertTrue(contextualStrings.remove(""));
assertTrue(contextualStrings.remove("bbb"));
@@ -114,7 +114,7 @@ public class MessageUtilsTest {
defaults.add("aaa");
defaults.add("zzz");
defaults.add("eee");
-Set contextualStringsDefault =
MessageUtils.getContextualStrings(message, "unknownKey", defaults);
+Set contextualStringsDefault =
MessageUtils.getContextualStrings(message, "unknownKey", defaults);
assertEquals(defaults, contextualStringsDefault);
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
index e6c216e839..81e9827412 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.aegis.type.xml;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -29,7 +31,6 @@ import org.w3c.dom.Element;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.DatabindingException;
@@ -100,17 +101,10 @@ public class SourceType extends AegisType {
}
}
-protected XMLReader createXMLReader() throws SAXException {
-// In JDK 1.4, the xml reader factory does not look for META-INF
-// services
-// If the org.xml.sax.driver system property is not defined, and
-// exception will be thrown.
-// In these cases, default to xerces parser
-
(cxf) branch coheigea/aegis-doctypes deleted (was b96852834b)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/aegis-doctypes in repository https://gitbox.apache.org/repos/asf/cxf.git was b96852834b Disallowing DTDs for Aegis SourceType The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) branch coheigea/aegis-doctypes created (now b96852834b)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/aegis-doctypes in repository https://gitbox.apache.org/repos/asf/cxf.git at b96852834b Disallowing DTDs for Aegis SourceType This branch includes the following new commits: new b96852834b Disallowing DTDs for Aegis SourceType The 1 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.
(cxf) 01/01: Disallowing DTDs for Aegis SourceType
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/aegis-doctypes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b96852834bb13ff8496d3bf743258dd8b04bfee1
Author: Colm O hEigeartaigh
AuthorDate: Wed Mar 6 20:00:09 2024 +
Disallowing DTDs for Aegis SourceType
---
.../aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
index 81e9827412..587fe82080 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
@@ -104,6 +104,8 @@ public class SourceType extends AegisType {
protected XMLReader createXMLReader() throws SAXException,
ParserConfigurationException {
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
+// Disable DTDs
+spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl";,
true);
return spf.newSAXParser().getXMLReader();
}
(cxf) 01/02: Disable URLDataSource by default for Aegis (#1727)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 659a8f9b10bc8037774c0399e61e77e3955fd230
Author: Colm O hEigeartaigh
AuthorDate: Wed Mar 6 15:43:02 2024 +
Disable URLDataSource by default for Aegis (#1727)
(cherry picked from commit d0baeb3ee64c6d7c883bd2f5c4cb0de6b0b5f463)
(cherry picked from commit f973751b67f79ea2b53fabb2f1762214b7d07131)
---
.../apache/cxf/aegis/type/mtom/AttachmentUtil.java | 31 +++---
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
index c44f1fabe5..5474d57369 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
@@ -31,9 +31,14 @@ import javax.activation.URLDataSource;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.util.UID;
import org.apache.cxf.attachment.AttachmentImpl;
+import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.message.Attachment;
public final class AttachmentUtil {
+// 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";
+
private AttachmentUtil() {
//utility class
}
@@ -52,15 +57,16 @@ public final class AttachmentUtil {
if (id == null) {
throw new DatabindingException("Cannot get attachment: null id");
}
+if (attachments == null) {
+return null;
+}
+
+
int i = id.indexOf("cid:");
if (i != -1) {
id = id.substring(4).trim();
}
-if (attachments == null) {
-return null;
-}
-
for (Iterator iter = attachments.iterator();
iter.hasNext();) {
Attachment a = iter.next();
if (a.getId().equals(id)) {
@@ -68,12 +74,17 @@ public final class AttachmentUtil {
}
}
-// Try loading the URL remotely
-try {
-URLDataSource source = new URLDataSource(new URL(id));
-return new AttachmentImpl(id, new DataHandler(source));
-} catch (MalformedURLException e) {
-return null;
+final boolean followUrls = Boolean.valueOf(SystemPropertyAction
+.getProperty(ATTACHMENT_XOP_FOLLOW_URLS_PROPERTY,
"false"));
+if (followUrls) {
+// Try loading the URL remotely
+try {
+URLDataSource source = new URLDataSource(new URL(id));
+return new AttachmentImpl(id, new DataHandler(source));
+} catch (MalformedURLException e) {
+return null;
+}
}
+return null;
}
}
(cxf) branch 3.5.x-fixes updated (0f345549d9 -> e8ef66b5ab)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 0f345549d9 Recording .gitmergeinfo Changes new 659a8f9b10 Disable URLDataSource by default for Aegis (#1727) new e8ef66b5ab 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 | 1 + .../apache/cxf/aegis/type/mtom/AttachmentUtil.java | 31 +++--- 2 files changed, 22 insertions(+), 10 deletions(-)
(cxf) 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit e8ef66b5ab3c3b8d9baf22c1b7feba89f96ea5ed Author: Colm O hEigeartaigh AuthorDate: Wed Mar 6 15:47:28 2024 + Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 9a36b6e6a0..c601b58b02 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -335,6 +335,7 @@ B be8074c6a9186f81e2d6ac6304ac68a4c5c655a4 B bf3c8a94434247be91967465347080191b1165ee B c00625127a0435a0da32583f1822a8e8a3aa54a2 B c0d5bad32938019dea92f99be0773abd39ad7288 +B c0d87da8ee874107069494959a655e35ccfb2f47 B c122fbdd9e1923cdb4daaef16f2e0fd65e2498b6 B c27cc7ad9107fd7ac71c15f758d90d1f57e25c46 B c302036d9de9bfae211571adadfb73ec18a37b56
(cxf) branch 3.6.x-fixes updated: Disable URLDataSource by default for Aegis (#1727)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 f973751b67 Disable URLDataSource by default for Aegis (#1727)
f973751b67 is described below
commit f973751b67f79ea2b53fabb2f1762214b7d07131
Author: Colm O hEigeartaigh
AuthorDate: Wed Mar 6 15:43:02 2024 +
Disable URLDataSource by default for Aegis (#1727)
(cherry picked from commit d0baeb3ee64c6d7c883bd2f5c4cb0de6b0b5f463)
---
.../apache/cxf/aegis/type/mtom/AttachmentUtil.java | 31 +++---
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
index c44f1fabe5..5474d57369 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
@@ -31,9 +31,14 @@ import javax.activation.URLDataSource;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.util.UID;
import org.apache.cxf.attachment.AttachmentImpl;
+import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.message.Attachment;
public final class AttachmentUtil {
+// 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";
+
private AttachmentUtil() {
//utility class
}
@@ -52,15 +57,16 @@ public final class AttachmentUtil {
if (id == null) {
throw new DatabindingException("Cannot get attachment: null id");
}
+if (attachments == null) {
+return null;
+}
+
+
int i = id.indexOf("cid:");
if (i != -1) {
id = id.substring(4).trim();
}
-if (attachments == null) {
-return null;
-}
-
for (Iterator iter = attachments.iterator();
iter.hasNext();) {
Attachment a = iter.next();
if (a.getId().equals(id)) {
@@ -68,12 +74,17 @@ public final class AttachmentUtil {
}
}
-// Try loading the URL remotely
-try {
-URLDataSource source = new URLDataSource(new URL(id));
-return new AttachmentImpl(id, new DataHandler(source));
-} catch (MalformedURLException e) {
-return null;
+final boolean followUrls = Boolean.valueOf(SystemPropertyAction
+.getProperty(ATTACHMENT_XOP_FOLLOW_URLS_PROPERTY,
"false"));
+if (followUrls) {
+// Try loading the URL remotely
+try {
+URLDataSource source = new URLDataSource(new URL(id));
+return new AttachmentImpl(id, new DataHandler(source));
+} catch (MalformedURLException e) {
+return null;
+}
}
+return null;
}
}
(cxf) branch coheigea/Aegis-MTOM deleted (was 3173d78b1b)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/Aegis-MTOM in repository https://gitbox.apache.org/repos/asf/cxf.git was 3173d78b1b Disable URLDataSource by default for Aegis The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) branch main updated: Disable URLDataSource by default for Aegis (#1727)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 d0baeb3ee6 Disable URLDataSource by default for Aegis (#1727)
d0baeb3ee6 is described below
commit d0baeb3ee64c6d7c883bd2f5c4cb0de6b0b5f463
Author: Colm O hEigeartaigh
AuthorDate: Wed Mar 6 15:43:02 2024 +
Disable URLDataSource by default for Aegis (#1727)
---
.../apache/cxf/aegis/type/mtom/AttachmentUtil.java | 31 +++---
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
index 31c70c805a..fbc7b21cf3 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
@@ -30,9 +30,14 @@ import jakarta.activation.URLDataSource;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.util.UID;
import org.apache.cxf.attachment.AttachmentImpl;
+import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.message.Attachment;
public final class AttachmentUtil {
+// 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";
+
private AttachmentUtil() {
//utility class
}
@@ -51,15 +56,16 @@ public final class AttachmentUtil {
if (id == null) {
throw new DatabindingException("Cannot get attachment: null id");
}
+if (attachments == null) {
+return null;
+}
+
+
int i = id.indexOf("cid:");
if (i != -1) {
id = id.substring(4).trim();
}
-if (attachments == null) {
-return null;
-}
-
for (Iterator iter = attachments.iterator();
iter.hasNext();) {
Attachment a = iter.next();
if (a.getId().equals(id)) {
@@ -67,12 +73,17 @@ public final class AttachmentUtil {
}
}
-// Try loading the URL remotely
-try {
-URLDataSource source = new URLDataSource(new URL(id));
-return new AttachmentImpl(id, new DataHandler(source));
-} catch (MalformedURLException e) {
-return null;
+final boolean followUrls = Boolean.valueOf(SystemPropertyAction
+.getProperty(ATTACHMENT_XOP_FOLLOW_URLS_PROPERTY,
"false"));
+if (followUrls) {
+// Try loading the URL remotely
+try {
+URLDataSource source = new URLDataSource(new URL(id));
+return new AttachmentImpl(id, new DataHandler(source));
+} catch (MalformedURLException e) {
+return null;
+}
}
+return null;
}
}
(cxf) branch coheigea/Aegis-MTOM created (now 3173d78b1b)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/Aegis-MTOM in repository https://gitbox.apache.org/repos/asf/cxf.git at 3173d78b1b Disable URLDataSource by default for Aegis This branch includes the following new commits: new 3173d78b1b Disable URLDataSource by default for Aegis The 1 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.
(cxf) 01/01: Disable URLDataSource by default for Aegis
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/Aegis-MTOM
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3173d78b1b36ec6ba5e1e34cea043fc5496f0bc2
Author: Colm O hEigeartaigh
AuthorDate: Wed Mar 6 14:29:31 2024 +
Disable URLDataSource by default for Aegis
---
.../apache/cxf/aegis/type/mtom/AttachmentUtil.java | 31 +++---
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
index 31c70c805a..fbc7b21cf3 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
@@ -30,9 +30,14 @@ import jakarta.activation.URLDataSource;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.util.UID;
import org.apache.cxf.attachment.AttachmentImpl;
+import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.message.Attachment;
public final class AttachmentUtil {
+// 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";
+
private AttachmentUtil() {
//utility class
}
@@ -51,15 +56,16 @@ public final class AttachmentUtil {
if (id == null) {
throw new DatabindingException("Cannot get attachment: null id");
}
+if (attachments == null) {
+return null;
+}
+
+
int i = id.indexOf("cid:");
if (i != -1) {
id = id.substring(4).trim();
}
-if (attachments == null) {
-return null;
-}
-
for (Iterator iter = attachments.iterator();
iter.hasNext();) {
Attachment a = iter.next();
if (a.getId().equals(id)) {
@@ -67,12 +73,17 @@ public final class AttachmentUtil {
}
}
-// Try loading the URL remotely
-try {
-URLDataSource source = new URLDataSource(new URL(id));
-return new AttachmentImpl(id, new DataHandler(source));
-} catch (MalformedURLException e) {
-return null;
+final boolean followUrls = Boolean.valueOf(SystemPropertyAction
+.getProperty(ATTACHMENT_XOP_FOLLOW_URLS_PROPERTY,
"false"));
+if (followUrls) {
+// Try loading the URL remotely
+try {
+URLDataSource source = new URLDataSource(new URL(id));
+return new AttachmentImpl(id, new DataHandler(source));
+} catch (MalformedURLException e) {
+return null;
+}
}
+return null;
}
}
(cxf) branch 3.6.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.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 c0d87da8ee Recording .gitmergeinfo Changes c0d87da8ee is described below commit c0d87da8ee874107069494959a655e35ccfb2f47 Author: Colm O hEigeartaigh AuthorDate: Wed Mar 6 12:20:29 2024 + Recording .gitmergeinfo Changes --- .gitmergeinfo | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 10b8734358..54cb2a7ecc 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -4,6 +4,7 @@ B 00b1c007eef119337217c9dde8de598d88c6544a B 00bbab65e59b8f27366335aec19e50129b7759f0 B 0194b82a60d9db30c858121af8e70f7d7fa1e5d9 B 02310e95fe74c0c031f540f3284e4a9bd856ced2 +B 0394808f2f31a60b41835b88d8be1628b344018b B 04bc5be2435c025bf5c37975bd493405bc91f6ca B 077f37412efa7bf857c6c34b6a2defb84fc587b4 B 09211352a70bef5e309f9e93a9548eb9657e0673 @@ -15,6 +16,7 @@ B 0f2a3fdf5ac92e4789f8099b75fe2fc841fdb048 B 0f2f9d35779a8e3387bb76d8d3b1ecd688a0c1da B 0f43bd534763f9ebe6ac8c2a0746bd257f5edc30 B 145b3a3fd6b598693a155ba329c720265e72b08f +B 1480c40d6de78230fde044002aff8ca798f14213 B 14b45d215535f4c69261dc8cdc5342b93c3c1235 B 194f6aa32321826865293527d0511a965a83fd54 B 19667e3aedadd5204d2356be758a1e2204e60ced @@ -35,6 +37,7 @@ B 34430af2299ae57407e61a759f8ef88f54493bb2 B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4 B 34f37609eb464b46e76f1f5d5340f9799df1008a B 352adc456a199854ff9b80fa27d9d53e8a3dbc98 +B 354f09f05ef61722e9d62f5c6c4fb777d7ef9c97 B 396c32848ff70a7cd77bfcd5ea80a4b4abe4c20c B 3983c304fcec6b40d60f3c804dd6537cf3b4d2c1 B 3a25cab6172083d26f2cc5f29a134c11214d5131 @@ -65,6 +68,7 @@ B 56667a4295c0e1a9694fc9d6a943447d0f39a575 B 57999b80bbdb93016dd8b336f671d83f3eaf3c8c B 58ae0ed63c9361ad5e9591c5cf8bf6f34d1649fd B 58d8029e6ffdacaab35c46d531aac289002eacdf +B 5c9ebca951d6caa36a5085e028d0bdcc9c4ee355 B 5e88225f5b45ca03416e616e77f602e62b25ace5 B 60aa618e06d0bbaadd7bc65d3cd3503673e53a6b B 60f00a123ee85f6865e24ee35a91e4ec6eced62c @@ -82,6 +86,7 @@ B 7dca49b11f913ff0cbbde40153fc52cd6bcc0aa1 B 7f4c668a04211e044c69fe51c0053567e39a13d6 B 7f683ba748e2133af0f93f1d77df5921b4e86011 B 83d19ef010183e53c5bbdecd14316dfe9fd09c3a +B 8433b2bbf6eedc177aa537e4a4058505220e019c B 853facf141d74ccce985926063ed12d3a9d5 B 89a19d577262ac534cf2c0f03ef6776b27903dbc B 8cc04ad0808d8ef3e062a9345cc0ef7698e8d089 @@ -161,6 +166,7 @@ B f35d8ae18b51088f7238a0af6b9caaca4da8ef95 B f3e15e52c7d27d5734d3716dc3beb9a19f879387 B f51d661070bef444f4bf85010b4d0cb5ab906e69 B f6e974e2eb317c610b440d13c4bc7cc3294e7ed0 +B f88b9bf2bc5121a8b8ed0629ff7685c2b1b447a1 B f8d1850dc906be4ac45e2630ae30961b20228938 B f8d9f35ba6986a13fb65eadd50b701b7cbf70113 B faefc09e44b6d53e857763f28b0a0636d901fe7f
(cxf) branch main updated: CXF-8983: cxf-services-sts-core should depend on cxf-rt-rs-security-jose (#1725)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 5c9ebca951 CXF-8983: cxf-services-sts-core should depend on
cxf-rt-rs-security-jose (#1725)
5c9ebca951 is described below
commit 5c9ebca951d6caa36a5085e028d0bdcc9c4ee355
Author: Peter Palaga
AuthorDate: Wed Mar 6 12:56:06 2024 +0100
CXF-8983: cxf-services-sts-core should depend on cxf-rt-rs-security-jose
(#1725)
instead of cxf-rt-rs-security-jose-jaxrs
---
services/sts/sts-core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 421fce099b..0b09a1e9ae 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -67,7 +67,7 @@
org.apache.cxf
-cxf-rt-rs-security-jose-jaxrs
+cxf-rt-rs-security-jose
${project.version}
compile
(cxf) branch coheigea/wss4j-3.0.3 deleted (was 2fe5a4b51d)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/wss4j-3.0.3 in repository https://gitbox.apache.org/repos/asf/cxf.git was 2fe5a4b51d Updating to WSS4J 3.0.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) branch main updated: Updating to WSS4J 3.0.3 (#1711)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 8433b2bbf6 Updating to WSS4J 3.0.3 (#1711)
8433b2bbf6 is described below
commit 8433b2bbf6eedc177aa537e4a4058505220e019c
Author: Colm O hEigeartaigh
AuthorDate: Wed Feb 28 16:56:23 2024 +0100
Updating to WSS4J 3.0.3 (#1711)
---
parent/pom.xml | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 97fad88d0f..54c81b85bd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,8 +235,7 @@
6.6.1
4.2.1
1.6.3
-3.0.4-SNAPSHOT
-3.0.5-SNAPSHOT
+3.0.3
2.3.1
3.8.13.Final
2.1
@@ -1985,11 +1984,6 @@
wss4j-ws-security-policy-stax
${cxf.jakarta.wss4j.version}
-
-org.apache.santuario
-xmlsec
-${cxf.santuario.version}
-
org.apache.maven.plugins
maven-javadoc-plugin
(cxf) branch coheigea/wss4j-3.0.3 updated (33b9805b0c -> 2fe5a4b51d)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/wss4j-3.0.3 in repository https://gitbox.apache.org/repos/asf/cxf.git discard 33b9805b0c Updating to WSS4J 3.0.3 add 2fe5a4b51d Updating to WSS4J 3.0.3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (33b9805b0c) \ N -- N -- N refs/heads/coheigea/wss4j-3.0.3 (2fe5a4b51d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: parent/pom.xml | 6 -- 1 file changed, 6 deletions(-)
(cxf) branch coheigea/wss4j-3.0.3 created (now 33b9805b0c)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/wss4j-3.0.3 in repository https://gitbox.apache.org/repos/asf/cxf.git at 33b9805b0c Updating to WSS4J 3.0.3 This branch includes the following new commits: new 33b9805b0c Updating to WSS4J 3.0.3 The 1 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.
(cxf) 01/01: Updating to WSS4J 3.0.3
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/wss4j-3.0.3 in repository https://gitbox.apache.org/repos/asf/cxf.git commit 33b9805b0c0b57ef2a78574ff5260f8ff71c8aaa Author: Colm O hEigeartaigh AuthorDate: Wed Feb 28 14:18:02 2024 +0100 Updating to WSS4J 3.0.3 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8fa5021929..a5635bf811 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -235,8 +235,8 @@ 6.6.0 4.2.1 1.6.3 -3.0.4-SNAPSHOT -3.0.5-SNAPSHOT +3.0.3 +3.0.4 2.3.1 3.8.13.Final 2.1
(cxf-fediz) branch main updated (f096dc69 -> 0d42a312)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from f096dc69 Merge pull request #248 from apache/dependabot/maven/jetty9.version-9.4.54.v20240208 add b2e4ed25 Bump spring.version from 5.3.31 to 5.3.32 add 0d42a312 Merge pull request #249 from apache/dependabot/maven/spring.version-5.3.32 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) 01/01: Merge pull request #248 from apache/dependabot/maven/jetty9.version-9.4.54.v20240208
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit f096dc69bfb525cefc21d9eacd3c7b0356f85084 Merge: f43cc0f3 291a6f67 Author: Colm O hEigeartaigh AuthorDate: Thu Feb 15 16:08:33 2024 + Merge pull request #248 from apache/dependabot/maven/jetty9.version-9.4.54.v20240208 Bump jetty9.version from 9.4.53.v20231009 to 9.4.54.v20240208 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (f43cc0f3 -> f096dc69)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from f43cc0f3 Merge pull request #246 from apache/dependabot/github_actions/actions/upload-artifact-4.3.1 add 291a6f67 Bump jetty9.version from 9.4.53.v20231009 to 9.4.54.v20240208 new f096dc69 Merge pull request #248 from apache/dependabot/maven/jetty9.version-9.4.54.v20240208 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf) branch 3.3.x-fixes updated: Removing Jenkinsfile on unsupported branches
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 18a0b8bf92 Removing Jenkinsfile on unsupported branches
18a0b8bf92 is described below
commit 18a0b8bf9263e136973963279d72fb8d7cc773af
Author: Colm O hEigeartaigh
AuthorDate: Tue Feb 13 06:56:11 2024 +
Removing Jenkinsfile on unsupported branches
---
Jenkinsfile | 176
1 file changed, 176 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 781ebe5f03..00
--- a/Jenkinsfile
+++ /dev/null
@@ -1,176 +0,0 @@
-#!groovy
-
-pipeline {
- agent none
- options {
-buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
-timeout(140)
-disableConcurrentBuilds()
-skipStagesAfterUnstable()
-quietPeriod(30)
- }
- triggers {
-pollSCM 'H/15 * * * *'
- }
- stages {
-stage('Prepare') {
- agent {
-label 'ubuntu'
- }
- stages {
-stage('Clean up') {
- steps {
-cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
- }
-}
- }
-}
-stage('Build') {
- matrix {
-agent {
- label 'ubuntu'
-}
-axes {
- axis {
-name 'JAVA_VERSION'
-values 'jdk_1.8_latest', 'jdk_11_latest'
- }
-}
-stages {
- stage('JDK specific build') {
-agent {
- label 'ubuntu'
-}
-tools {
- jdk "${JAVA_VERSION}"
- maven 'maven_latest'
-}
-environment {
- MAVEN_OPTS = "-Xmx1024m"
-}
-stages {
- stage('Build & Test') {
-steps {
- sh 'mvn -B clean install'
- // step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
-}
-post {
- always {
-junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
-junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
- }
-}
- }
- /* stage('Build Source & JavaDoc') {
- when {
-branch 'master'
- }
- steps {
-dir("local-snapshots-dir/") {
- deleteDir()
-}
-sh 'mvn -B source:jar javadoc:jar -DskipAssembbly'
- }
-}
-stage('Deploy Snapshot') {
- when {
-branch 'master'
- }
- steps {
-withCredentials([file(credentialsId:
'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
- sh 'mvn -U -B -e clean install -Pdeploy,everything,nochecks
-Dmaven.test.skip.exec=true -V -DobrRepository=NONE'
-}
- }
-}
-stage('Code Quality') {
- when {
-branch 'master'
- }
- steps {
-withCredentials([string(credentialsId: 'asf-cxf-sonarcloud',
variable: 'SONARCLOUD_TOKEN')]) {
- sh 'mvn sonar:sonar -DskipAssembly -Dsonar.projectKey=cxf
-Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io
-Dsonar.login=${SONARCLOUD_TOKEN}'
-}
- }
-} */
-}
-post {
- always {
-cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
- }
-}
- }
-}
- }
-}
- }
- post {
-// If this build failed, send an email to the list.
-failure {
- script {
-emailext(
-to: "notificati...@cxf.apache.org",
-recipientProviders: [[$class: 'DevelopersRecipientProvider']],
-from: "Mr. Jenkins ",
-subject: "Jenkins job ${env.JOB_NAME}#${env.BUILD_NUMBER} failed",
-body: """
-There is a build failure in ${env.JOB_NAME}.
-
-Build: ${env.BUILD_URL}
-Logs: ${env.BUILD_URL}console
-Changes: ${env.BUILD_URL}changes
-
---
-Mr. Jenkins
-Director of Continuous Integrati
(cxf) branch 3.4.x-fixes updated: Removing Jenkinsfile on unsupported branches
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 97884f4b52 Removing Jenkinsfile on unsupported branches
97884f4b52 is described below
commit 97884f4b523ed6b70ac8ba01a1205a7e47594226
Author: Colm O hEigeartaigh
AuthorDate: Tue Feb 13 06:56:11 2024 +
Removing Jenkinsfile on unsupported branches
---
Jenkinsfile | 176
1 file changed, 176 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index f52d35ae8e..00
--- a/Jenkinsfile
+++ /dev/null
@@ -1,176 +0,0 @@
-#!groovy
-
-pipeline {
- agent none
- options {
-buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
-timeout(140)
-disableConcurrentBuilds()
-skipStagesAfterUnstable()
-quietPeriod(30)
- }
- triggers {
-pollSCM 'H/15 * * * *'
- }
- stages {
-stage('Prepare') {
- agent {
-label 'ubuntu'
- }
- stages {
-stage('Clean up') {
- steps {
-cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
- }
-}
- }
-}
-stage('Build') {
- matrix {
-agent {
- label 'ubuntu'
-}
-axes {
- axis {
-name 'JAVA_VERSION'
-values 'jdk_1.8_latest', 'jdk_11_latest', 'jdk_15_latest'
- }
-}
-stages {
- stage('JDK specific build') {
-agent {
- label 'ubuntu'
-}
-tools {
- jdk "${JAVA_VERSION}"
- maven 'maven_latest'
-}
-environment {
- MAVEN_OPTS = "-Xmx1024m"
-}
-stages {
- stage('Build & Test') {
-steps {
- sh 'mvn -B clean install'
- // step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
-}
-post {
- always {
-junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
-junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
- }
-}
- }
- /* stage('Build Source & JavaDoc') {
- when {
-branch 'master'
- }
- steps {
-dir("local-snapshots-dir/") {
- deleteDir()
-}
-sh 'mvn -B source:jar javadoc:jar -DskipAssembbly'
- }
-}
-stage('Deploy Snapshot') {
- when {
-branch 'master'
- }
- steps {
-withCredentials([file(credentialsId:
'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
- sh 'mvn -U -B -e clean install -Pdeploy,everything,nochecks
-Dmaven.test.skip.exec=true -V -DobrRepository=NONE'
-}
- }
-}
-stage('Code Quality') {
- when {
-branch 'master'
- }
- steps {
-withCredentials([string(credentialsId: 'asf-cxf-sonarcloud',
variable: 'SONARCLOUD_TOKEN')]) {
- sh 'mvn sonar:sonar -DskipAssembly -Dsonar.projectKey=cxf
-Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io
-Dsonar.login=${SONARCLOUD_TOKEN}'
-}
- }
-} */
-}
-post {
- always {
-cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
- }
-}
- }
-}
- }
-}
- }
- post {
-// If this build failed, send an email to the list.
-failure {
- script {
-emailext(
-to: "notificati...@cxf.apache.org",
-recipientProviders: [[$class: 'DevelopersRecipientProvider']],
-from: "Mr. Jenkins ",
-subject: "Jenkins job ${env.JOB_NAME}#${env.BUILD_NUMBER} failed",
-body: """
-There is a build failure in ${env.JOB_NAME}.
-
-Build: ${env.BUILD_URL}
-Logs: ${env.BUILD_URL}console
-Changes: ${env.BUILD_URL}changes
-
---
-Mr. Jenkins
-
(cxf-fediz) branch main updated (0ae6f31c -> f43cc0f3)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from 0ae6f31c Merge pull request #245 from apache/dependabot/maven/org.junit.jupiter-junit-jupiter-engine-5.10.2 add 68bb8a62 Bump actions/upload-artifact from 4.3.0 to 4.3.1 new f43cc0f3 Merge pull request #246 from apache/dependabot/github_actions/actions/upload-artifact-4.3.1 The 1 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/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) 01/01: Merge pull request #246 from apache/dependabot/github_actions/actions/upload-artifact-4.3.1
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit f43cc0f3c4f7f33705ac842fb5cf712956e0b9f5 Merge: 0ae6f31c 68bb8a62 Author: Colm O hEigeartaigh AuthorDate: Tue Feb 13 06:50:55 2024 + Merge pull request #246 from apache/dependabot/github_actions/actions/upload-artifact-4.3.1 Bump actions/upload-artifact from 4.3.0 to 4.3.1 .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) branch main updated (d9b9c62e -> 0ae6f31c)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git from d9b9c62e Updating release notes for 1.6.2 add 329330ca Bump org.junit.jupiter:junit-jupiter-engine from 5.10.1 to 5.10.2 new 0ae6f31c Merge pull request #245 from apache/dependabot/maven/org.junit.jupiter-junit-jupiter-engine-5.10.2 The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-fediz) 01/01: Merge pull request #245 from apache/dependabot/maven/org.junit.jupiter-junit-jupiter-engine-5.10.2
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit 0ae6f31c0d1ffbd8787cfb0aeb788033d1879ca0 Merge: d9b9c62e 329330ca Author: Colm O hEigeartaigh AuthorDate: Fri Feb 9 07:52:02 2024 + Merge pull request #245 from apache/dependabot/maven/org.junit.jupiter-junit-jupiter-engine-5.10.2 Bump org.junit.jupiter:junit-jupiter-engine from 5.10.1 to 5.10.2 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
