From adb5592f9aadda8015eef4240501bb2ca7383f01 Mon Sep 17 00:00:00 2001 From: "CITE\\dtziotzios" Date: Mon, 14 Oct 2024 10:41:21 +0300 Subject: [PATCH] pom updates --- backend/core/pom.xml | 12 +- backend/pom.xml | 114 +----------------- backend/web/pom.xml | 102 +--------------- .../OpencdmpPermissionPolicyContextImpl.java | 2 +- .../configurations/SecurityConfiguration.java | 4 +- .../main/resources/logging/logback-devel.xml | 4 +- 6 files changed, 20 insertions(+), 218 deletions(-) diff --git a/backend/core/pom.xml b/backend/core/pom.xml index 1ab478e2e..0091819ef 100644 --- a/backend/core/pom.xml +++ b/backend/core/pom.xml @@ -5,12 +5,12 @@ 4.0.0 core - ${revision} + 1.0.0-SNAPSHOT org.opencdmp opencdmp-backend - ${revision} + 1.0.0-SNAPSHOT ../pom.xml @@ -20,7 +20,6 @@ 21 21 UTF-8 - 1.0.0-SNAPSHOT @@ -52,7 +51,7 @@ gr.cite oidc-authz - 2.2.0 + 2.2.1 org.opencdmp @@ -82,12 +81,12 @@ gr.cite queue-inbox - 2.1.1 + 2.1.2 gr.cite queue-outbox - 2.1.1 + 2.1.2 @@ -120,6 +119,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.8.1 21 21 diff --git a/backend/pom.xml b/backend/pom.xml index 993e4de66..6622d47aa 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,13 +5,13 @@ org.opencdmp opencdmp-backend OpenCDMP Backend Parent - ${revision} + 1.0.0-SNAPSHOT pom org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 @@ -24,19 +24,16 @@ 1.19.0 0.2.0 21 - 1.9 4.11 1.2.17 2.15.0 - 1.0.0-SNAPSHOT 21 21 21 - org.json json @@ -50,55 +47,41 @@ org.springframework.boot spring-boot-starter-data-jpa - org.apache.httpcomponents.client5 httpclient5 - org.apache.httpcomponents httpcore-nio - org.apache.httpcomponents httpcore 4.4.13 - org.hibernate.orm hibernate-core 6.5.2.Final - org.hibernate.orm hibernate-c3p0 - - com.jayway.jsonpath json-path 2.9.0 - - - com.fasterxml.jackson.dataformat jackson-dataformat-xml - - - com.fasterxml.jackson.core jackson-core - com.fasterxml.jackson.core jackson-databind @@ -108,62 +91,11 @@ jackson-datatype-jsr310 2.17.0 - - - - - - - org.apache.commons commons-lang3 3.14.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - io.micrometer micrometer-registry-prometheus @@ -173,7 +105,6 @@ org.springframework.boot spring-boot-starter-actuator - io.micrometer micrometer-core @@ -205,46 +136,10 @@ - devel + cite-dev true - - jar - - - - - - - - - - - - - - - production - - jar - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - - - profile - production - - - - - cite-dev cite-maven @@ -252,9 +147,6 @@ https://crepo.cite.gr/repository/cite-maven/ - - true - diff --git a/backend/web/pom.xml b/backend/web/pom.xml index d5542f48a..741c02aa5 100644 --- a/backend/web/pom.xml +++ b/backend/web/pom.xml @@ -5,13 +5,13 @@ 4.0.0 web - ${revision} - ${packaging.type} + 1.0.0-SNAPSHOT + jar org.opencdmp opencdmp-backend - ${revision} + 1.0.0-SNAPSHOT ../pom.xml @@ -20,15 +20,13 @@ 21 21 21 - 1.0.0-SNAPSHOT - jar org.opencdmp core - ${revision} + 1.0.0-SNAPSHOT @@ -39,10 +37,6 @@ org.springframework.boot spring-boot-starter-webflux - - - - com.fasterxml.jackson.core jackson-annotations @@ -51,36 +45,17 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - - - - - - - - io.swagger swagger-annotations 1.6.14 - - org.junit.jupiter junit-jupiter-api 5.10.3 test - org.postgresql postgresql @@ -89,44 +64,25 @@ org.hibernate.orm hibernate-core - - - org.springdoc springdoc-openapi-starter-webmvc-ui 2.3.0 - org.springframework.boot spring-boot-starter-tomcat - gr.cite cors-web - 2.1.0 + 2.1.1 gr.cite exceptions-web - 2.2.0 + 2.2.1 gr.cite @@ -141,19 +97,6 @@ - ${project.artifactId}-${project.version} - - - src/main/ui-resources - - node_modules/** - - - - src/main/resources - - - org.apache.maven.plugins @@ -168,39 +111,6 @@ org.springframework.boot spring-boot-maven-plugin - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - org.opencdmp.OpenCDMPApplication - dependency-jars/ - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.5.1 - - - copy-dependencies - package - - copy-dependencies - - - - ${project.build.directory}/dependency-jars/ - - - - - \ No newline at end of file diff --git a/backend/web/src/main/java/org/opencdmp/configurations/OpencdmpPermissionPolicyContextImpl.java b/backend/web/src/main/java/org/opencdmp/configurations/OpencdmpPermissionPolicyContextImpl.java index 819bbe8c1..6d4fe7db0 100644 --- a/backend/web/src/main/java/org/opencdmp/configurations/OpencdmpPermissionPolicyContextImpl.java +++ b/backend/web/src/main/java/org/opencdmp/configurations/OpencdmpPermissionPolicyContextImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; @Service public class OpencdmpPermissionPolicyContextImpl extends PermissionPolicyContextImpl { + private final CustomPolicyService customPolicyService; private final CustomPolicyCacheService customPolicyCacheService; private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(OpencdmpPermissionPolicyContextImpl.class)); @@ -46,5 +47,4 @@ public class OpencdmpPermissionPolicyContextImpl extends PermissionPolicyContext logger.info("Authorization policies found: {}", this.policies.size()); this.reload(); } - } diff --git a/backend/web/src/main/java/org/opencdmp/configurations/SecurityConfiguration.java b/backend/web/src/main/java/org/opencdmp/configurations/SecurityConfiguration.java index 460a1cab3..63dd3ab98 100644 --- a/backend/web/src/main/java/org/opencdmp/configurations/SecurityConfiguration.java +++ b/backend/web/src/main/java/org/opencdmp/configurations/SecurityConfiguration.java @@ -58,7 +58,7 @@ public class SecurityConfiguration { .headers(httpSecurityHeadersConfigurer -> httpSecurityHeadersConfigurer.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable)) .addFilterBefore(apiKeyFilter, AbstractPreAuthenticatedProcessingFilter.class) .authorizeHttpRequests(authRequest -> - authRequest.requestMatchers(buildAntPatterns(webSecurityProperties.getAllowedEndpoints())).anonymous() + authRequest.requestMatchers(buildAntPatterns(webSecurityProperties.getAllowedEndpoints())).anonymous() .requestMatchers(buildAntPatterns(webSecurityProperties.getAuthorizedEndpoints())).authenticated()) .sessionManagement( sessionManagementConfigurer-> sessionManagementConfigurer.sessionCreationPolicy(SessionCreationPolicy.NEVER)) .oauth2ResourceServer(oauth2 -> oauth2.authenticationManagerResolver(authenticationManagerResolver)); @@ -108,7 +108,7 @@ public class SecurityConfiguration { // public PermissionPolicyContext permissionPolicyContext(){ // return new PermissionPolicyContextImpl(configuration); // } - + @Bean AuthorizationRequirementMapper authorizationRequirementMapper() { return new AuthorizationRequirementMapper() { diff --git a/backend/web/src/main/resources/logging/logback-devel.xml b/backend/web/src/main/resources/logging/logback-devel.xml index fc4eccd00..e657db136 100644 --- a/backend/web/src/main/resources/logging/logback-devel.xml +++ b/backend/web/src/main/resources/logging/logback-devel.xml @@ -10,7 +10,7 @@ logs/logging.log logs/logging.%d{yyyy-MM-dd}.%i.log - + 100MB 15 @@ -24,7 +24,7 @@ logs/auditing.log logs/auditing.%d{yyyy-MM-dd}.%i.log - + 100MB 15