diff --git a/README.md b/README.md index 311ed582..6576c7a9 100644 --- a/README.md +++ b/README.md @@ -23,19 +23,6 @@ The Semantic Hub is a logical and architectural component of Tractus-X. The source code under this folder contains reference implementations of the SLDT Semantic Hub ## Build Packages -The project requires a private package from https://maven.pkg.github.com/eclipse-dataspaceconnector/DataSpaceConnector. -Add the following configuration to your `.m2/settings.xml`: - -```xml - - edc-github - oauth2 - $ADD_GITHUB_ACCESS_TOKEN_HERE - -``` - -You need to add your own GitHub Access Token. Navigate to https://github.com/settings/tokens and create a new token -with the permission `read:packages`. Run `mvn install` to run unit tests, build and install the package. diff --git a/backend/Dockerfile b/backend/Dockerfile index ab32740c..d7da3236 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -18,7 +18,7 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -FROM eclipse-temurin:11-jre +FROM eclipse-temurin:11.0.16.1_1-jre-jammy RUN apt-get -y upgrade \ && apt-get -y update \ diff --git a/backend/pom.xml b/backend/pom.xml index cc5e7ff5..a1fea91e 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -62,10 +62,6 @@ org.springframework.boot spring-boot-starter-jetty - - org.springframework.cloud - spring-cloud-starter-openfeign - org.springframework.boot spring-boot-starter-test @@ -108,6 +104,17 @@ io.openmanufacturing sds-aspect-model-starter + + + jackson-dataformat-xml + com.fasterxml.jackson.dataformat + 2.12.7 + io.openmanufacturing sds-aspect-model-aas-generator diff --git a/backend/src/main/java/org/eclipse/tractusx/semantics/OAuthSecurityConfig.java b/backend/src/main/java/org/eclipse/tractusx/semantics/OAuthSecurityConfig.java index be2cd32c..0b163764 100644 --- a/backend/src/main/java/org/eclipse/tractusx/semantics/OAuthSecurityConfig.java +++ b/backend/src/main/java/org/eclipse/tractusx/semantics/OAuthSecurityConfig.java @@ -33,11 +33,11 @@ public class OAuthSecurityConfig extends WebSecurityConfigurerAdapter { protected void configure(HttpSecurity http) throws Exception { http .authorizeRequests(auth -> auth - .antMatchers(HttpMethod.OPTIONS).permitAll() - .mvcMatchers(HttpMethod.GET,"/**/models/**").access("@authorizationEvaluator.hasRoleViewSemanticModel()") - .mvcMatchers(HttpMethod.POST,"/**/models/**").access("@authorizationEvaluator.hasRoleAddSemanticModel()") - .mvcMatchers(HttpMethod.PUT,"/**/models/**").access("@authorizationEvaluator.hasRoleUpdateSemanticModel()") - .mvcMatchers(HttpMethod.DELETE,"/**/models/**").access("@authorizationEvaluator.hasRoleDeleteSemanticModel()")) + .mvcMatchers(HttpMethod.OPTIONS).permitAll() + .antMatchers(HttpMethod.GET,"/**/models/**").access("@authorizationEvaluator.hasRoleViewSemanticModel()") + .antMatchers(HttpMethod.POST,"/**/models/**").access("@authorizationEvaluator.hasRoleAddSemanticModel()") + .antMatchers(HttpMethod.PUT,"/**/models/**").access("@authorizationEvaluator.hasRoleUpdateSemanticModel()") + .antMatchers(HttpMethod.DELETE,"/**/models/**").access("@authorizationEvaluator.hasRoleDeleteSemanticModel()")) .csrf().disable() .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() .oauth2ResourceServer().jwt(); diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index cabe83f2..0f972cbb 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -55,6 +55,9 @@ http: spring: application: name: semantics-services + mvc: + pathmatch: + matching-strategy: ant-path-matcher banner: location: "classpath:banner.txt" servlet: diff --git a/pom.xml b/pom.xml index 8fc5baab..1823e3e8 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.14 + 2.7.3 @@ -65,9 +65,7 @@ - 2.5.14 - 2020.0.3 - 5.3.20 + 2.7.3 3.1.3 1.6.6 2.9.2 @@ -165,13 +163,6 @@ ${google.findbugs.version} - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - org.springframework.boot spring-boot-starter-web @@ -213,22 +204,6 @@ - - org.springframework.cloud - spring-cloud-starter-openfeign - ${spring.feign.version} - - - org.springframework.cloud - spring-cloud-openfeign-core - ${spring.feign.version} - - - org.springframework - spring-test - ${spring.version} - test - org.springframework.boot spring-boot-starter-data-jpa @@ -240,12 +215,6 @@ - - org.springframework - spring-webmvc - ${spring.version} - - org.springdoc @@ -280,31 +249,6 @@ jackson-databind-nullable 0.1.0 - - io.github.openfeign - feign-core - ${feign-version} - - - io.github.openfeign - feign-jackson - ${feign-version} - - - io.github.openfeign - feign-slf4j - ${feign-version} - - - io.github.openfeign.form - feign-form - ${feign-form-version} - - - org.apache.httpcomponents - httpclient - ${httpcomponents.version} -