Skip to content

Commit 06aee50

Browse files
sanagaraj-pivotalBoykoAlex
authored andcommitted
Removed SAML asserting party property migration as it is no longer relevant for Spring Boot 3.0 migration.
1 parent 22d6c95 commit 06aee50

File tree

9 files changed

+1
-216
lines changed

9 files changed

+1
-216
lines changed

applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -237,17 +237,6 @@ private void verifyYamlConfigurationUpdate() {
237237
" restclient.sniffer.delay-after-failure: '3'\n" +
238238
" restclient.sniffer.interval: '4'\n" +
239239
" username: username\n" +
240-
" security:\n" +
241-
" saml2:\n" +
242-
" relyingparty:\n" +
243-
" registration:\n" +
244-
" idpone:\n" +
245-
" assertingparty:\n" +
246-
" verification:\n" +
247-
" credentials:\n" +
248-
" certificate-location: classpath:saml/idpone.crt\n" +
249-
" entity-id: https://idpone.com\n" +
250-
" sso-url: https://idpone.com\n" +
251240
" cassandra:\n" +
252241
" keyspaceName: testKeySpace\n" +
253242
" contactPoints: localhost\n" +
@@ -306,10 +295,6 @@ private void verifyPropertyConfigurationUpdate() {
306295
"spring.elasticsearch.restclient.sniffer.interval=4\n" +
307296
"spring.elasticsearch.username=username\n" +
308297
"\n" +
309-
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.entity-id=https://idpone.com\n" +
310-
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.sso-url=https://idpone.com\n" +
311-
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.verification.credentials.certificate-location=classpath:saml/idpone.crt\n" +
312-
"\n" +
313298
"server.reactive.session.cookie.same-site=true\n" +
314299
"\n" +
315300
"spring.datasource.url=jdbc:h2:mem:testdb\n" +

applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_MultiModule_IntegrationTest.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,6 @@ private void verifyYamlConfigurationUpdate() {
8888
" restclient.sniffer.delay-after-failure: '3'\n" +
8989
" restclient.sniffer.interval: '4'\n" +
9090
" username: username\n" +
91-
" security:\n" +
92-
" saml2:\n" +
93-
" relyingparty:\n" +
94-
" registration:\n" +
95-
" idpone:\n" +
96-
" assertingparty:\n" +
97-
" verification:\n" +
98-
" credentials:\n" +
99-
" certificate-location: classpath:saml/idpone.crt\n" +
100-
" entity-id: https://idpone.com\n" +
101-
" sso-url: https://idpone.com\n" +
10291
" cassandra:\n" +
10392
" keyspaceName: testKeySpace\n" +
10493
" contactPoints: localhost\n" +
@@ -155,10 +144,6 @@ private void verifyPropertyConfigurationUpdate() {
155144
"spring.elasticsearch.restclient.sniffer.interval=4\n" +
156145
"spring.elasticsearch.username=username\n" +
157146
"\n" +
158-
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.entity-id=https://idpone.com\n" +
159-
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.sso-url=https://idpone.com\n" +
160-
"spring.security.saml2.relyingparty.registration.idpone.assertingparty.verification.credentials.certificate-location=classpath:saml/idpone.crt\n" +
161-
"\n" +
162147
"server.reactive.session.cookie.same-site=true\n" +
163148
"\n" +
164149
"spring.datasource.url=jdbc:h2:mem:testdb\n" +

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.properties

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
management.endpoint.jolokia.config="abc"
2+
management.endpoint.jolokia.config="abc"
23
management.endpoint.jolokia.enabled=true
34
management.metrics.graphql.autotime.percentiles=100
45
management.metrics.graphql.autotime.percentiles-histogram=20
@@ -108,10 +109,6 @@ spring.jta.atomikos.properties.default-jta-timeout=9
108109
spring.jta.atomikos.properties.checkpoint-interval=10
109110
spring.jta.atomikos.properties.allow-sub-transactions=true
110111

111-
spring.security.saml2.relyingparty.registration.idpone.identityprovider.entity-id=https://idpone.com
112-
spring.security.saml2.relyingparty.registration.idpone.identityprovider.sso-url=https://idpone.com
113-
spring.security.saml2.relyingparty.registration.idpone.identityprovider.verification.credentials.certificate-location=classpath:saml/idpone.crt
114-
115112
spring.webflux.session.cookie.same-site=true
116113

117114
spring.datasource.url=jdbc:h2:mem:testdb

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,6 @@ spring:
137137
type: type1
138138
config:
139139
use-legacy-processing: 'false'
140-
security:
141-
saml2:
142-
relyingparty:
143-
registration:
144-
idpone:
145-
identityprovider:
146-
verification:
147-
credentials:
148-
certificate-location: classpath:saml/idpone.crt
149-
entity-id: https://idpone.com
150-
sso-url: https://idpone.com
151140
webflux:
152141
session:
153142
cookie:

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ spring.jta.atomikos.properties.default-jta-timeout=9
108108
spring.jta.atomikos.properties.checkpoint-interval=10
109109
spring.jta.atomikos.properties.allow-sub-transactions=true
110110

111-
spring.security.saml2.relyingparty.registration.idpone.identityprovider.entity-id=https://idpone.com
112-
spring.security.saml2.relyingparty.registration.idpone.identityprovider.sso-url=https://idpone.com
113-
spring.security.saml2.relyingparty.registration.idpone.identityprovider.verification.credentials.certificate-location=classpath:saml/idpone.crt
114-
115111
spring.webflux.session.cookie.same-site=true
116112

117113
spring.datasource.url=jdbc:h2:mem:testdb

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,6 @@ spring:
137137
type: type1
138138
config:
139139
use-legacy-processing: 'false'
140-
security:
141-
saml2:
142-
relyingparty:
143-
registration:
144-
idpone:
145-
identityprovider:
146-
verification:
147-
credentials:
148-
certificate-location: classpath:saml/idpone.crt
149-
entity-id: https://idpone.com
150-
sso-url: https://idpone.com
151140
webflux:
152141
session:
153142
cookie:

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/SamlRelyingPartyPropertyApplicationPropertiesMove.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-dependency-version-update.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -99,32 +99,6 @@
9999
condition:
100100
type: org.springframework.sbm.common.migration.conditions.TrueCondition
101101

102-
- type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
103-
condition:
104-
type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
105-
versionPattern: "3\\.0\\..*"
106-
description: Migrate SAML configuration to Spring Boot 3.0 in yaml format
107-
openRewriteRecipe: |-
108-
type: specs.openrewrite.org/v1beta/recipe
109-
name: org.openrewrite.java.spring.boot2.SpringBootPropertiesManual_2_7
110-
displayName: Migrate SAML configuration to Spring Boot 3.0 in yaml format
111-
description: Renames spring.security.saml2.relyingparty.registration.(any).identityprovider to spring.security.saml2.relyingparty.registration.(any).assertingparty.
112-
recipeList:
113-
- org.openrewrite.yaml.ChangeKey:
114-
oldKeyPath: $.spring.security.saml2.relyingparty.registration.*[?(@.identityprovider)]
115-
newKey: assertingparty
116-
- type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
117-
condition:
118-
type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
119-
versionPattern: "3\\.0\\..*"
120-
description: Migrate SAML configuration to Spring Boot 3.0 in properties format
121-
openRewriteRecipe: |-
122-
type: specs.openrewrite.org/v1beta/recipe
123-
name: org.openrewrite.java.spring.boot2.SpringBootPropertiesManual_2_7
124-
displayName: Migrate SAML properties to Spring Boot 3.0 in properties
125-
description: Renames spring.security.saml2.relyingparty.registration.(any).identityprovider to spring.security.saml2.relyingparty.registration.(any).assertingparty.
126-
recipeList:
127-
- org.springframework.sbm.boot.upgrade_27_30.SamlRelyingPartyPropertyApplicationPropertiesMove
128102
- type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
129103
condition:
130104
type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject

components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/SAML2RelyingPartyConfigurationReportSectionTest.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)