diff options
| author |   Toine Siebelink <toine.siebelink@est.tech> | 2023-09-20 09:35:10 +0000 |
|---|---|---|
| committer | Toine Siebelink <toine.siebelink@est.tech> | 2023-09-20 12:48:19 +0000 |
| commit | ad9b701a00c237ae8e462de76b500c8612866da6 (patch) | |
| tree | 5f96ff03f2e4d5f3423c28bdffbfeb7c943cf924 /cps-application | |
| parent | bba4d73e53cc79263fc162c4907facf43f13bdbf (diff) | |
Revert "Migrate CPS to Spring-boot 3.0"
This reverts commit 9693ec51cf6526082f0ad0c3ad208d144cbbb163.
Reason for revert: Bug fix delivery
Change-Id: I73bdc1528192c662983b0bbef73b10b6d612a719
Signed-off-by: egernug <gerard.nugent@est.tech>
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Diffstat (limited to 'cps-application')
| -rwxr-xr-x | cps-application/pom.xml | 13 | ||||
| -rw-r--r-- | cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java | 6 | ||||
| -rw-r--r-- | cps-application/src/main/resources/application.yml | 2 |
3 files changed, 6 insertions, 15 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml index 15868b1596..e8869707ce 100755 --- a/cps-application/pom.xml +++ b/cps-application/pom.xml @@ -40,7 +40,6 @@ <minimum-coverage>0.86</minimum-coverage> <base.image>${docker.pull.registry}/onap/integration-java17:12.0.0</base.image> <image.tag>${project.version}-${maven.build.timestamp}</image.tag> - <jakarta-servlet.version>5.0.0</jakarta-servlet.version> </properties> <dependencies> @@ -71,8 +70,8 @@ <artifactId>micrometer-registry-prometheus</artifactId> </dependency> <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-tracing-bridge-brave</artifactId> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-starter-sleuth</artifactId> </dependency> <!-- T E S T D E P E N D E N C I E S --> <dependency> @@ -119,14 +118,6 @@ <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - </dependency> </dependencies> <build> diff --git a/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java b/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java index c8b2509637..aedc6a8d66 100644 --- a/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java +++ b/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java @@ -54,7 +54,7 @@ public class WebSecurityConfig { * @param password password */ public WebSecurityConfig( - @Autowired @Value("${permit-uri}") final String permitUris, + @Autowired @Value("${security.permit-uri}") final String permitUris, @Autowired @Value("${security.auth.username}") final String username, @Autowired @Value("${security.auth.password}") final String password ) { @@ -80,8 +80,8 @@ public class WebSecurityConfig { http .httpBasic() .and() - .authorizeHttpRequests() - .requestMatchers(permitUris).permitAll() + .authorizeRequests() + .antMatchers(permitUris).permitAll() .anyRequest().authenticated() .and() .csrf().disable(); diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml index 016356801d..58748271cc 100644 --- a/cps-application/src/main/resources/application.yml +++ b/cps-application/src/main/resources/application.yml @@ -140,10 +140,10 @@ springdoc: - name: cps-ncmp-inventory url: /api-docs/cps-ncmp/openapi-inventory.yaml -permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/** security: # comma-separated uri patterns which do not require authorization + permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/** auth: username: ${CPS_USERNAME} password: ${CPS_PASSWORD} |