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 2024/05/31 23:18:33 UTC
(cxf) branch 4.0.x-fixes updated (30a4a03801 -> c59992c6fe)
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 30a4a03801 Recording .gitmergeinfo Changes
new 88fcb1cd84 Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 (#1903)
new fe671c151e Bump org.webjars:swagger-ui from 5.17.11 to 5.17.14 (#1904)
new fa812772eb Clean up Apache CXF BOM (removing non-existing artifacts)
new c59992c6fe 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 | 1 +
bom/pom.xml | 53 ++-------------------------
distribution/src/main/release/samples/pom.xml | 4 +-
parent/pom.xml | 8 +++-
pom.xml | 2 +-
5 files changed, 14 insertions(+), 54 deletions(-)
(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 c59992c6fe6ec3205de0499d2beb91ffbcdd760a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri May 31 19:12:27 2024 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index be459e3ad6..cba2244b34 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -27,6 +27,7 @@ M 79fd113bae51d0e9bf0300f1e79a9c6add5d3563
M 7f33a57480f7377bc1c7be9f281e9905a2df9792
M 81115252cc4815c383c5713795f41fe7a9b6dc2f
M 81f2683bfe081b44514a57bb80f0b1ca4986742e
+M 8cc050b21a33c6c917eb50d0785286a7a43f76df
M 99c88879b905c0fab21a4901d7da1a090db56c1b
M 9e499509931af040026c908444bacbea93bade6e
M a0ad89088d2865836ec6d34b4fe8a58aa7684621
(cxf) 02/04: Bump org.webjars:swagger-ui from 5.17.11 to 5.17.14 (#1904)
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 fe671c151ee8adbfeda51322ea2ec116bcc45e87
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri May 31 15:08:47 2024 -0400
Bump org.webjars:swagger-ui from 5.17.11 to 5.17.14 (#1904)
Bumps [org.webjars:swagger-ui](https://github.com/swagger-api/swagger-ui) from 5.17.11 to 5.17.14.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.17.11...v5.17.14)
---
updated-dependencies:
- dependency-name: org.webjars:swagger-ui
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 8cc050b21a33c6c917eb50d0785286a7a43f76df)
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 519ddcb56b..79aad13dae 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -36,7 +36,7 @@
<cxf.jetty11.version>11.0.21</cxf.jetty11.version>
<cxf.netty.version>4.1.110.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>5.17.11</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.17.14</cxf.swagger.ui.version>
<cxf.tika.version>2.9.1</cxf.tika.version>
<cxf.tomcat.version>10.1.23</cxf.tomcat.version>
<cxf.jboss.weld.version>4.0.3.Final</cxf.jboss.weld.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 57a0b73dc0..1583e490c4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -217,7 +217,7 @@
<cxf.spring.security.version>6.1.8</cxf.spring.security.version>
<cxf.spring.version>6.0.21</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>5.17.11</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.17.14</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.2.22</cxf.swagger.v3.version>
<cxf.tika.version>2.9.1</cxf.tika.version>
<cxf.tomcat.version>10.1.23</cxf.tomcat.version>
(cxf) 03/04: Clean up Apache CXF BOM (removing non-existing artifacts)
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 fa812772eb8e952a89b4135483a92a825bcaf066
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri May 31 19:10:52 2024 -0400
Clean up Apache CXF BOM (removing non-existing artifacts)
(cherry picked from commit e91a5107dd9ec8046f17c6570d799d16985476c0)
---
bom/pom.xml | 53 +++--------------------------------------------------
parent/pom.xml | 6 ++++++
2 files changed, 9 insertions(+), 50 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 070676408e..49f9160970 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -89,11 +89,6 @@
<artifactId>cxf-rt-bindings-corba</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-object</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
@@ -114,16 +109,6 @@
<artifactId>cxf-rt-databinding-jaxb</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-jibx</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-sdo</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-clustering</artifactId>
@@ -259,11 +244,6 @@
<artifactId>cxf-rt-rs-security-oauth2-saml</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-xml</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
@@ -271,17 +251,17 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-security-sso-oidc</artifactId>
+ <artifactId>cxf-rt-rs-security-sso-oidc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-security-sso-saml</artifactId>
+ <artifactId>cxf-rt-rs-security-sso-saml</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-security-xml</artifactId>
+ <artifactId>cxf-rt-rs-security-xml</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -404,11 +384,6 @@
<artifactId>cxf-rt-ws-security</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security-oauth2</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
@@ -499,8 +474,6 @@
<artifactId>cxf-jaxws-wsdlfirst</artifactId>
<version>${project.version}</version>
</dependency>
-
-
<dependency>
<groupId>org.apache.cxf.benchmark</groupId>
<artifactId>cxf-benchmark-base</artifactId>
@@ -511,16 +484,6 @@
<artifactId>cxf-benchmark-soapdoclit</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf.karaf</groupId>
- <artifactId>apache-cxf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.karaf</groupId>
- <artifactId>cxf-karaf-commands</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf.services.sts</groupId>
<artifactId>cxf-services-sts-core</artifactId>
@@ -561,16 +524,6 @@
<artifactId>cxf-services-xkms-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf.services.xkms</groupId>
- <artifactId>cxf-services-xkms-features</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.services.xkms</groupId>
- <artifactId>cxf-services-xkms-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf.services.xkms</groupId>
<artifactId>cxf-services-xkms-service</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1583e490c4..5de3179fcb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1999,6 +1999,12 @@
<artifactId>ehcache</artifactId>
<version>${cxf.ehcache3.version}</version>
<classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
(cxf) 01/04: Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 (#1903)
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 88fcb1cd8420365f1b59b600c5762fa410636b92
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri May 31 08:06:21 2024 -0400
Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 (#1903)
Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.4.1...enforcer-3.5.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit f3e2e6fc360d3c26ae489e552f60da6357479811)
---
distribution/src/main/release/samples/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index e9ec8d6570..519ddcb56b 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -228,7 +228,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.4.1</version>
+ <version>3.5.0</version>
<executions>
<execution>
<goals>
diff --git a/pom.xml b/pom.xml
index 21275cf2d7..65c6e3b308 100644
--- a/pom.xml
+++ b/pom.xml
@@ -645,7 +645,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.4.1</version>
+ <version>3.5.0</version>
<configuration>
<rules>
<requireJavaVersion>