You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2025/01/21 22:07:49 UTC
(cxf) branch 4.0.x-fixes updated (ce63c47d70 -> 49f8f7afba)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from ce63c47d70 Update Jackson to 2.18.2 (#2228)
new 8f07847f88 Bump org.assertj:assertj-core from 3.27.2 to 3.27.3 (#2229)
new 487fc2da64 Bump org.owasp:dependency-check-maven from 12.0.0 to 12.0.1 (#2231)
new a8a09c2aff CXF-8765: Option to remove Ehcache (enhance JCache API and providers presence detection in JCacheUtils)
new 49f8f7afba Recording .gitmergeinfo Changes
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 +++
parent/pom.xml | 2 +-
pom.xml | 2 +-
.../java/org/apache/cxf/ws/security/utils/JCacheUtils.java | 10 ++++++++--
4 files changed, 13 insertions(+), 4 deletions(-)
(cxf) 02/04: Bump org.owasp:dependency-check-maven from 12.0.0 to 12.0.1 (#2231)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 487fc2da64ae6a64252082e923fed46839346beb
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Jan 21 07:39:03 2025 -0500
Bump org.owasp:dependency-check-maven from 12.0.0 to 12.0.1 (#2231)
Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 12.0.0 to 12.0.1.
- [Release notes](https://github.com/jeremylong/DependencyCheck/releases)
- [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jeremylong/DependencyCheck/compare/v12.0.0...v12.0.1)
---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-maven
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 0623a227b1000e4d93ba41d894df37dc591942e0)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7f0420ba19..438d33b855 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<cxf.jdk.version>11</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
- <maven-owasp-plugin-version>12.0.0</maven-owasp-plugin-version>
+ <maven-owasp-plugin-version>12.0.1</maven-owasp-plugin-version>
<preparationGoals>clean install</preparationGoals>
</properties>
<distributionManagement>
(cxf) 01/04: Bump org.assertj:assertj-core from 3.27.2 to 3.27.3 (#2229)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8f07847f8861fc1b0386d60473e09607209652cd
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jan 20 09:31:09 2025 -0500
Bump org.assertj:assertj-core from 3.27.2 to 3.27.3 (#2229)
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.2 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.2...assertj-build-3.27.3)
---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit f4e2acbd708bfd38f2d9efa8ecfdad15d3e07352)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 38c2b43395..bb6e363aad 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -93,7 +93,7 @@
<cxf.arquillian.version>1.8.1.Final</cxf.arquillian.version>
<cxf.arquillian.weld.container.version>3.0.0.Final</cxf.arquillian.weld.container.version>
<cxf.aspectj.version>1.9.22.1</cxf.aspectj.version>
- <cxf.assertj.version>3.27.2</cxf.assertj.version>
+ <cxf.assertj.version>3.27.3</cxf.assertj.version>
<cxf.atmosphere.version.range>[3.0, 4.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>3.0.13</cxf.atmosphere.version>
<cxf.bcprov.version>1.77</cxf.bcprov.version>
(cxf) 03/04: CXF-8765: Option to remove Ehcache (enhance JCache API and providers presence detection in JCacheUtils)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a8a09c2aff2f3b68df2da80b4e6a181c6bed905e
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 20 21:02:50 2025 -0500
CXF-8765: Option to remove Ehcache (enhance JCache API and providers presence detection in JCacheUtils)
(cherry picked from commit b82c4bb038477427f4516bb6ffc9271c6ca8e517)
---
.../java/org/apache/cxf/ws/security/utils/JCacheUtils.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/utils/JCacheUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/utils/JCacheUtils.java
index 223207695e..dcbe901b51 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/utils/JCacheUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/utils/JCacheUtils.java
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.ws.security.utils;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
import java.util.function.Function;
import java.util.logging.Logger;
@@ -35,10 +37,14 @@ public final class JCacheUtils {
boolean jcacheInstalled = false;
try {
final Class<?> caching = Class.forName("javax.cache.Caching");
+ final Class<?> cachingProvider = Class.forName("javax.cache.spi.CachingProvider");
if (caching != null) {
- jcacheInstalled = true;
+ jcacheInstalled = MethodHandles
+ .publicLookup()
+ .findStatic(caching, "getCachingProvider", MethodType.methodType(cachingProvider))
+ .invoke() != null;
}
- } catch (Exception e) {
+ } catch (Throwable e) {
LOG.fine("No JCache SPIs detected on classpath: " + e.getMessage());
}
JCACHE_INSTALLED = jcacheInstalled;
(cxf) 04/04: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 49f8f7afba3bd0e42487de197c261ce39d210057
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jan 21 17:00:20 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3089db488b..b5393c31af 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -10,6 +10,7 @@ M 044751c86e887257d8fb748fc507dc958a56bf2c
M 04644b02a4f96e2896d16948dfaa4f09b75ee55a
M 04e63723d7c9fe04fd6f6f95d287f2e60daad3d9
M 053d11f2eb99ad0baaafb1ada383d18419d154c7
+M 0623a227b1000e4d93ba41d894df37dc591942e0
M 071b5e1cb0621088cf1ea7c2046a7a5d5ea7d1bc
M 087af6c9856a816a88948303527d56380b89bbd9
M 094bdcf3ad075f3c3f901d2977e165f5182808c9
@@ -293,6 +294,7 @@ M da3f484d06fa874456d34edd3a01e4fd0454ec3e
M dae5fcb2c77c4497677746ebeb6eb53b9406ec16
M dc08a738df3e10f133f4dc149c2cdbdf56ed8350
M dc3bf296e2cb34b302b54b4a965a48267bd992ad
+M dd3ce33c2ccbec205c06b44f8886710561e272ec
M dd74a63a8e59aa2bc762a41370e444cadae4c899
M dd7dc2748586a9bb639770da49d62c46bbda4571
M ddd74e7e65a65d24ce5bfc642a433a020ad10f58
@@ -337,6 +339,7 @@ M f3b86013ba82abeb6d9079134280a306a500fcea
M f3bfb4f76e83ca3bd58c8d934ecbaea4f98d3284
M f44d763079a7800536547e7d0c06c1ec690bff5e
M f496518dfa0e846faf0ce245de2b2abeec5819f1
+M f4e2acbd708bfd38f2d9efa8ecfdad15d3e07352
M f5069f2c7d5a761f3231129dd936486af1e80bdd
M f59149412650a48bee86534d75778c74906f169d
M f6b36af889fe92371ac6a7f6ac8dde22cacf51d6