This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c6bb420c649359dc0953864512dd5dd6682547b3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 17 09:01:53 2023 -0400
Bump cxf.aspectj.version from 1.9.19 to 1.9.20 (#1388)
Bumps `cxf.aspectj.version` from 1.9.19 to 1.9.20.
Updates `org.aspectj:aspectjweaver` from 1.9.19 to 1.9.20
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)
Updates `org.aspectj:aspectjrt` from 1.9.19 to 1.9.20
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)
---
updated-dependencies:
- dependency-name: org.aspectj:aspectjweaver
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.aspectj:aspectjrt
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit ac74c726758bfa34402c4b833859390c03c1f2eb)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# parent/pom.xml
---
.../src/main/release/samples/jax_rs/spring_security/pom.xml | 8 ++------
distribution/src/main/release/samples/pom.xml | 1 +
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
index caa2fac899..7bc434ad9e 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
@@ -31,8 +31,6 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <aspectj.version>1.9.1</aspectj.version>
- <spring.security.version>5.3.4.RELEASE</spring.security.version>
</properties>
<build>
<finalName>JAXRSSpringSecurity</finalName>
@@ -125,22 +123,20 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>${aspectj.version}</version>
+ <version>${cxf.aspectj.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>${aspectj.version}</version>
+ <version>${cxf.aspectj.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index ba6cdf0b21..faad57d02e 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -39,6 +39,7 @@
<cxf.tika.version>2.7.0</cxf.tika.version>
<cxf.tomcat.version>9.0.78</cxf.tomcat.version>
<cxf.lucene.version>9.7.0</cxf.lucene.version>
+ <cxf.aspectj.version>1.9.20</cxf.aspectj.version>
<cxf.brave.version>5.16.0</cxf.brave.version>
</properties>
<dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 246ef327e4..8c3d8bcb50 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -81,7 +81,7 @@
<cxf.ahc.version>2.12.3</cxf.ahc.version>
<cxf.arquillian.version>1.6.0.Final</cxf.arquillian.version>
<cxf.arquillian.weld.container.version>2.0.1.Final</cxf.arquillian.weld.container.version>
- <cxf.aspectj.version>1.9.19</cxf.aspectj.version>
+ <cxf.aspectj.version>1.9.20</cxf.aspectj.version>
<cxf.assertj.version>3.24.2</cxf.assertj.version>
<cxf.atmosphere.version.range>[2.4, 3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
