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/01/04 02:09:52 UTC
(cxf) branch 3.6.x-fixes updated (f8eb1117e3 -> c8a91c5bd9)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from f8eb1117e3 Recording .gitmergeinfo Changes
new 221b7e986e Bump org.assertj:assertj-core from 3.24.2 to 3.25.0 (#1618)
new 44f938a4cd Bump com.puppycrawl.tools:checkstyle from 10.12.6 to 10.12.7 (#1619)
new 261aca3238 Bump org.assertj:assertj-core from 3.25.0 to 3.25.1 (#1620)
new 4a979e725c CXF-8834: "Operation [{.../wsdl}Issue] already exists" when calling JaxWsServerFactoryBean.create() for SecurityTokenService (#1616)
new c8a91c5bd9 Recording .gitmergeinfo Changes
The 5 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 | 2 ++
parent/pom.xml | 4 +--
.../sts/provider/SecurityTokenService.java | 2 +-
.../sts/provider/SecurityTokenServiceImplTest.java | 13 +++++++--
.../provider/SecurityTokenServiceProviderTest.java | 31 ----------------------
5 files changed, 16 insertions(+), 36 deletions(-)
delete mode 100644 rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProviderTest.java
(cxf) 03/05: Bump org.assertj:assertj-core from 3.25.0 to 3.25.1 (#1620)
Posted by re...@apache.org.
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 261aca3238395095f9376d77e44d201e474bd5b9
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Jan 3 00:07:38 2024 -0500
Bump org.assertj:assertj-core from 3.25.0 to 3.25.1 (#1620)
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.0 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.0...assertj-build-3.25.1)
---
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 4ce6eddb3586d3ca3d32da2795f26386aa71ab7f)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 37bc92b220..1cb7417267 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,7 +82,7 @@
<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.21</cxf.aspectj.version>
- <cxf.assertj.version>3.25.0</cxf.assertj.version>
+ <cxf.assertj.version>3.25.1</cxf.assertj.version>
<cxf.atmosphere.version.range>[2.4, 3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
<cxf.bcprov.version>1.77</cxf.bcprov.version>
(cxf) 01/05: Bump org.assertj:assertj-core from 3.24.2 to 3.25.0 (#1618)
Posted by re...@apache.org.
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 221b7e986e17b45972206d4162b50794f93f5525
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jan 1 12:52:19 2024 -0500
Bump org.assertj:assertj-core from 3.24.2 to 3.25.0 (#1618)
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.0.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.0)
---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
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 2698de3a12d71ce99601750bb23a5f67dcd56c3b)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ee70e062c8..7dbd038746 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,7 +82,7 @@
<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.21</cxf.aspectj.version>
- <cxf.assertj.version>3.24.2</cxf.assertj.version>
+ <cxf.assertj.version>3.25.0</cxf.assertj.version>
<cxf.atmosphere.version.range>[2.4, 3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
<cxf.bcprov.version>1.77</cxf.bcprov.version>
(cxf) 05/05: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c8a91c5bd9170b20ccafaa4ac257d94a97af0c6c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 3 20:59:18 2024 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3cafcf1ba6..3eaf29484d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -285,6 +285,7 @@ M 253186a0d19c628e84e0558dd950a6d6b9e5be93
M 2534e01ee84f47d5fd75af56c811b041d24b5234
M 254586ce54966d15dffd9933f76c6d7581142c18
M 258f21c97196c4f177d1106d0390a9517d3dbff2
+M 2698de3a12d71ce99601750bb23a5f67dcd56c3b
M 27813a0523e1b4ab7cccd980ef63d7249627f4e8
M 278431e8adc631b7089f979d455fc54a721c7ab0
M 27c684af98a2cc3e6a530a19aee5b1412df9eab1
@@ -388,6 +389,7 @@ M 4bb4154125648a04d88cb7999f4d054a00e5c79b
M 4c66ec00da1c2a4df5807d708c0dbafb02b3c02c
M 4cb0bfdb4506ba0c3ce4b4f811857a7e13966c08
M 4cb2f639f1317e4fdcd2a01b5afb9f951964eee6
+M 4ce6eddb3586d3ca3d32da2795f26386aa71ab7f
M 4d7faf61a0a3a06146581f6f6d1611d3ff812e23
M 4d930d6aab5136f1093448c6337da3e2dbe5d9a8
M 4ddf748459a54aaf3cfb25736ca32b81bfde4d68
(cxf) 04/05: CXF-8834: "Operation [{.../wsdl}Issue] already exists" when calling JaxWsServerFactoryBean.create() for SecurityTokenService (#1616)
Posted by re...@apache.org.
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 4a979e725cc66039b48d85a275268663a6dd4295
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 3 20:29:52 2024 -0500
CXF-8834: "Operation [{.../wsdl}Issue] already exists" when calling JaxWsServerFactoryBean.create() for SecurityTokenService (#1616)
(cherry picked from commit 39109f07422b4d5bc82a168aabb678f8b84dab41)
---
.../sts/provider/SecurityTokenService.java | 2 +-
.../sts/provider/SecurityTokenServiceImplTest.java | 13 +++++++--
.../provider/SecurityTokenServiceProviderTest.java | 31 ----------------------
3 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenService.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenService.java
index 7dc71410ff..7fc53af53e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenService.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenService.java
@@ -74,7 +74,7 @@ public interface SecurityTokenService {
partName = "response")
@Action(input = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue",
output = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTRC/IssueFinal")
- @WebMethod(operationName = "Issue")
+ @WebMethod(operationName = "IssueSingle")
RequestSecurityTokenResponseType issueSingle(
@WebParam(partName = "request",
name = "RequestSecurityToken",
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImplTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImplTest.java
index bb03169827..b9774141ef 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImplTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceImplTest.java
@@ -19,12 +19,21 @@
package org.apache.cxf.ws.security.sts.provider;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class SecurityTokenServiceImplTest {
-
@Test
- public void doTest() {
+ public void testCreateService() {
+ final JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
+ factory.setServiceBean(new SecurityTokenServiceImpl());
+ factory.setAddress("local://SecurityTokenService");
+ factory.setTransportId(LocalTransportFactory.TRANSPORT_ID);
+ final Server server = factory.create();
+ server.destroy();
}
}
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProviderTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProviderTest.java
deleted file mode 100644
index eebd36b582..0000000000
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProviderTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.ws.security.sts.provider;
-
-import org.junit.Test;
-
-public class SecurityTokenServiceProviderTest {
-
- @Test
- public void doTest() {
-
- }
-
-}
(cxf) 02/05: Bump com.puppycrawl.tools:checkstyle from 10.12.6 to 10.12.7 (#1619)
Posted by re...@apache.org.
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 44f938a4cdd4f4bfc3dbcd0b3c450c3c7286b889
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jan 1 18:20:01 2024 -0500
Bump com.puppycrawl.tools:checkstyle from 10.12.6 to 10.12.7 (#1619)
Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.12.6 to 10.12.7.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.12.6...checkstyle-10.12.7)
---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
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 8138d1e0874fe2dba69f8d41d33804313ecb34b8)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7dbd038746..37bc92b220 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -395,7 +395,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>10.12.6</version>
+ <version>10.12.7</version>
</dependency>
</dependencies>
<configuration>