From bba73d104288915c8e76f37bf928b9f0575bdec7 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Wed, 11 Jan 2023 09:34:23 +0100 Subject: [PATCH 01/44] chore(springboot):[-] Update to Spring Boot 3, fix issues Changes necessary: - Switch from javax to jakarta packages - Update Resilience4j to Spring Boot 3 - Adapt to changed APIs --- irs-api/pom.xml | 78 ++++--------------- .../irs/configuration/RestTemplateConfig.java | 3 +- .../configuration/SecurityConfiguration.java | 9 ++- .../configuration/TrustedEndpointsFilter.java | 16 ++-- .../irs/controllers/IrsController.java | 4 +- .../OutboundMeterRegistryService.java | 1 + .../TrustedEndpointsFilterTest.java | 16 ++-- .../irs/edc/EdcSubmodelClientTest.java | 15 ++-- .../OutboundMeterRegistryServiceTest.java | 6 +- .../irs/component/AsyncFetchedItems.java | 5 +- .../component/GlobalAssetIdentification.java | 3 +- .../eclipse/tractusx/irs/component/Job.java | 6 +- .../tractusx/irs/component/JobParameter.java | 4 +- .../irs/component/ProcessingError.java | 4 +- .../tractusx/irs/component/Quantity.java | 5 +- .../tractusx/irs/component/RegisterJob.java | 11 ++- pom.xml | 4 +- 17 files changed, 71 insertions(+), 119 deletions(-) diff --git a/irs-api/pom.xml b/irs-api/pom.xml index 98848b2e3c..8293ca02fd 100644 --- a/irs-api/pom.xml +++ b/irs-api/pom.xml @@ -22,11 +22,6 @@ - - - 5.7.5 - - io.minio @@ -70,6 +65,11 @@ snakeyaml 1.33 + + org.springframework.boot + spring-boot-properties-migrator + runtime + org.springframework.boot spring-boot-starter-actuator @@ -88,68 +88,20 @@ org.springframework.boot - spring-boot-starter-security - - - org.springframework.data - spring-data-commons - - - - - - - org.springframework.security - spring-security-oauth2-client - - 5.7.5 - - - org.springframework.security - spring-security-web - - 5.7.5 - - - org.springframework.security - spring-security-core - - 5.7.5 - - - org.springframework.security - spring-security-crypto - - 5.7.5 + spring-boot-starter-oauth2-client - org.springframework.security - spring-security-config - - 5.7.5 - - - org.springframework.security - spring-security-oauth2-resource-server - - 5.7.5 + org.springframework.boot + spring-boot-starter-security - org.springframework.security - spring-security-oauth2-core - - 5.7.5 + org.springframework.boot + spring-boot-starter-validation - org.springframework.security - spring-security-oauth2-jose - - 5.7.5 + org.springframework.data + spring-data-commons - - - - org.springframework.cloud @@ -254,13 +206,13 @@ io.github.resilience4j - resilience4j-spring-boot2 + resilience4j-spring-boot3 ${resilience4j.version} com.github.tomakehurst - wiremock-jre8 - 2.35.0 + wiremock-standalone + 2.27.2 test diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/RestTemplateConfig.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/RestTemplateConfig.java index e693ba0f2d..d453f51acc 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/RestTemplateConfig.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/RestTemplateConfig.java @@ -35,7 +35,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; -import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; @@ -117,7 +116,7 @@ private RestTemplate oAuthRestTemplate(final RestTemplateBuilder restTemplateBui * @return false */ @Override - public boolean hasError(final HttpStatus statusCode) { + public boolean hasError(final ClientHttpResponse statusCode) { return false; } }); diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java index dc2e6746a5..c08f07a865 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.header.writers.XXssProtectionHeaderWriter; import org.springframework.security.web.util.matcher.AnyRequestMatcher; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; @@ -76,7 +77,7 @@ public class SecurityConfiguration { .preload(true) .requestMatcher(AnyRequestMatcher.INSTANCE); - httpSecurity.headers().xssProtection().xssProtectionEnabled(true).block(true); + httpSecurity.headers().xssProtection().headerValue(XXssProtectionHeaderWriter.HeaderValue.ENABLED_MODE_BLOCK); httpSecurity.headers().frameOptions().sameOrigin(); @@ -84,10 +85,10 @@ public class SecurityConfiguration { .sessionManagement() .sessionCreationPolicy(STATELESS) .and() - .authorizeRequests() - .antMatchers(WHITELIST) + .authorizeHttpRequests() + .requestMatchers(WHITELIST) .permitAll() - .antMatchers("/**") + .requestMatchers("/**") .authenticated() .and() .oauth2ResourceServer(oauth2ResourceServer -> diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilter.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilter.java index 24c3b8333b..2d1fc66b2f 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilter.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilter.java @@ -23,14 +23,14 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java index bc40426fe5..821688ecc3 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.UUID; -import javax.validation.Valid; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryService.java index f24672ed22..abd3453599 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryService.java @@ -64,6 +64,7 @@ public class OutboundMeterRegistryService { retryRegistry.retry(ENDPOINT_REGISTRY).getEventPublisher().onRetry(event -> counterRetriesRegistry.increment()); retryRegistry.getAllRetries() + .stream() .filter(retry -> !ENDPOINT_REGISTRY.equals(retry.getName())) .forEach(retry -> retry.getEventPublisher() .onRetry(event -> incrementSubmodelRetryCounter(retry.getName()))); diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilterTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilterTest.java index f131b0ff57..06727bb635 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilterTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilterTest.java @@ -29,14 +29,14 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import org.eclipse.tractusx.irs.IrsApplication; import org.junit.jupiter.api.Test; diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java index 397a3dc5a7..16957a8f1f 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java @@ -29,8 +29,11 @@ import static org.mockito.Mockito.when; import java.io.IOException; -import java.io.InputStream; +import java.net.URISyntaxException; +import java.net.URL; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; import java.time.Clock; import java.time.Duration; import java.time.Instant; @@ -43,7 +46,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import com.github.jknack.handlebars.internal.Files; import io.github.resilience4j.retry.RetryRegistry; import org.eclipse.dataspaceconnector.spi.types.domain.edr.EndpointDataReference; import org.eclipse.tractusx.irs.component.GlobalAssetIdentification; @@ -149,10 +151,11 @@ void shouldTimeOut() throws Exception { } @NotNull - private String readAssemblyPartRelationshipData() throws IOException { - final InputStream resourceAsStream = getClass().getResourceAsStream("/__files/assemblyPartRelationship.json"); - Objects.requireNonNull(resourceAsStream); - return Files.read(resourceAsStream, StandardCharsets.UTF_8); + private String readAssemblyPartRelationshipData() throws IOException, URISyntaxException { + final URL resource = getClass().getResource("/__files/assemblyPartRelationship.json"); + Objects.requireNonNull(resource); + + return Files.readString(Path.of(resource.toURI()), StandardCharsets.UTF_8); } @Test diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryServiceTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryServiceTest.java index 0f62472195..a7ddcd897f 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryServiceTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryServiceTest.java @@ -26,12 +26,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.util.Set; + import io.github.resilience4j.retry.Retry; import io.github.resilience4j.retry.RetryRegistry; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; -import io.vavr.collection.Array; -import io.vavr.collection.Seq; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -54,7 +54,7 @@ void setUp() { final Retry.EventPublisher publisher = mock(Retry.EventPublisher.class); when(retry.getEventPublisher()).thenReturn(publisher); - final Seq seq = Array.empty(); + final Set seq = Set.of(); when(retryRegistry.getAllRetries()).thenReturn(seq); testee = new OutboundMeterRegistryService(meterRegistry, retryRegistry); diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/AsyncFetchedItems.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/AsyncFetchedItems.java index ef18ef0a04..a4c8e665eb 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/AsyncFetchedItems.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/AsyncFetchedItems.java @@ -21,10 +21,9 @@ ********************************************************************************/ package org.eclipse.tractusx.irs.component; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GlobalAssetIdentification.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GlobalAssetIdentification.java index 7283f78aa7..e3995182e9 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GlobalAssetIdentification.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GlobalAssetIdentification.java @@ -23,8 +23,6 @@ import java.io.IOException; -import javax.validation.Valid; - import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; @@ -32,6 +30,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import lombok.Value; diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Job.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Job.java index 5157d2d7af..65db43f476 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Job.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Job.java @@ -24,13 +24,13 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonUnwrapped; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.ToString; diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobParameter.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobParameter.java index b92a1bc455..3e94166447 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobParameter.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobParameter.java @@ -23,10 +23,10 @@ import java.util.List; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Singular; diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProcessingError.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProcessingError.java index 7a71bb1c7a..70e92fee2f 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProcessingError.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProcessingError.java @@ -23,12 +23,12 @@ import java.time.ZonedDateTime; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.Builder; import lombok.Value; import org.eclipse.tractusx.irs.component.enums.ProcessStep; diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Quantity.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Quantity.java index 7f6159f622..b8e97e76cf 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Quantity.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Quantity.java @@ -21,9 +21,8 @@ ********************************************************************************/ package org.eclipse.tractusx.irs.component; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/RegisterJob.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/RegisterJob.java index 67e0a74a83..b04f7f158e 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/RegisterJob.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/RegisterJob.java @@ -23,14 +23,13 @@ import java.util.List; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - import io.swagger.v3.oas.annotations.media.ArraySchema; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/pom.xml b/pom.xml index 7d124569d1..fe2f8a79e8 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ - 2.7.7 + 3.0.1 3.1.5 1.6.7 1.10.0 @@ -43,7 +43,7 @@ 4.6.0 3.23.1 3.7.6 - 1.7.1 + 2.0.2 1.1.0 From c754f5843abbc3b6f7b68d763da858c8c65140ce Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Wed, 11 Jan 2023 10:10:35 +0100 Subject: [PATCH 02/44] chore(springboot):[-] Update to Spring Boot 3, fix issues Changes necessary: - Nimbusds JOSE switched to GSON --- irs-api/pom.xml | 3 +- .../configuration/SecurityConfiguration.java | 58 +++++++++---------- .../converter/JwtAuthenticationConverter.java | 34 ++++++----- .../JwtAuthenticationConverterTest.java | 35 ++++++----- 4 files changed, 71 insertions(+), 59 deletions(-) diff --git a/irs-api/pom.xml b/irs-api/pom.xml index 8293ca02fd..2cf9fb2c16 100644 --- a/irs-api/pom.xml +++ b/irs-api/pom.xml @@ -121,7 +121,8 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui + 2.0.0 org.springframework.boot diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java index c08f07a865..bb2e24c3e0 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java @@ -30,7 +30,7 @@ import org.eclipse.tractusx.irs.configuration.converter.JwtAuthenticationConverter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.web.SecurityFilterChain; @@ -45,25 +45,24 @@ */ @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableMethodSecurity public class SecurityConfiguration { - private static final String[] WHITELIST = { - "/actuator/health", - "/actuator/health/readiness", - "/actuator/health/liveness", - "/actuator/prometheus", - "/api/swagger-ui/**", - "/api/api-docs", - "/api/api-docs.yaml", - "/api/api-docs/swagger-config", - "/" + IrsApplication.API_PREFIX_INTERNAL + "/endpoint-data-reference" + private static final String[] WHITELIST = { "/actuator/health", + "/actuator/health/readiness", + "/actuator/health/liveness", + "/actuator/prometheus", + "/api/swagger-ui/**", + "/api/api-docs", + "/api/api-docs.yaml", + "/api/api-docs/swagger-config", + "/" + IrsApplication.API_PREFIX_INTERNAL + "/endpoint-data-reference" }; private static final long HSTS_MAX_AGE_DAYS = 365; @SuppressWarnings("PMD.SignatureDeclareThrowsException") @Bean - /* package */ SecurityFilterChain securityFilterChain(final HttpSecurity httpSecurity) throws Exception { + /* package */ SecurityFilterChain securityFilterChain(final HttpSecurity httpSecurity) throws Exception { httpSecurity.httpBasic().disable(); httpSecurity.formLogin().disable(); httpSecurity.csrf().disable(); @@ -81,30 +80,31 @@ public class SecurityConfiguration { httpSecurity.headers().frameOptions().sameOrigin(); - httpSecurity - .sessionManagement() - .sessionCreationPolicy(STATELESS) - .and() - .authorizeHttpRequests() - .requestMatchers(WHITELIST) - .permitAll() - .requestMatchers("/**") - .authenticated() - .and() - .oauth2ResourceServer(oauth2ResourceServer -> - oauth2ResourceServer.jwt().jwtAuthenticationConverter(new JwtAuthenticationConverter()) - ) - .oauth2Client(); + httpSecurity.sessionManagement() + .sessionCreationPolicy(STATELESS); + + httpSecurity.authorizeHttpRequests(auth -> auth + .requestMatchers(WHITELIST) + .permitAll() + .requestMatchers("/**") + .authenticated()); + + httpSecurity.oauth2ResourceServer(oauth2ResourceServer -> oauth2ResourceServer.jwt() + .jwtAuthenticationConverter( + new JwtAuthenticationConverter())) + .oauth2Client(); return httpSecurity.build(); } @Bean - /* package */ CorsConfigurationSource corsConfigurationSource() { + /* package */ CorsConfigurationSource corsConfigurationSource() { final CorsConfiguration configuration = new CorsConfiguration(); configuration.setAllowedOriginPatterns(List.of("*")); configuration.setAllowCredentials(true); - configuration.setAllowedHeaders(List.of("Access-Control-Allow-Headers", "Access-Control-Allow-Origin", "Access-Control-Request-Method", "Access-Control-Request-Headers", "Origin", "Cache-Control", "Content-Type", "Authorization")); + configuration.setAllowedHeaders( + List.of("Access-Control-Allow-Headers", "Access-Control-Allow-Origin", "Access-Control-Request-Method", + "Access-Control-Request-Headers", "Origin", "Cache-Control", "Content-Type", "Authorization")); configuration.setAllowedMethods(List.of("HEAD", "GET", "PUT", "POST", "DELETE", "PATCH", "OPTIONS")); final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", configuration); diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java index bb29f52bbb..76d59a6753 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java @@ -27,9 +27,11 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import java.util.stream.StreamSupport; -import com.nimbusds.jose.shaded.json.JSONArray; -import com.nimbusds.jose.shaded.json.JSONObject; +import com.nimbusds.jose.shaded.gson.JsonArray; +import com.nimbusds.jose.shaded.gson.JsonObject; +import com.nimbusds.jose.shaded.gson.JsonPrimitive; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.core.convert.converter.Converter; @@ -52,11 +54,9 @@ public class JwtAuthenticationConverter implements Converter grantedAuthorities = jwtGrantedAuthoritiesConverter.convert(source); - final Collection authorities = - Stream.concat( + final Collection authorities = Stream.concat( grantedAuthorities != null ? grantedAuthorities.stream() : Stream.empty(), - irsTokenParser.extractIrsRolesFromToken(source).stream() - ).collect(Collectors.toSet()); + irsTokenParser.extractIrsRolesFromToken(source).stream()).collect(Collectors.toSet()); return new JwtAuthenticationToken(source, authorities); } @@ -73,21 +73,23 @@ public AbstractAuthenticationToken convert(final @NotNull Jwt source) { /** * Parsing JWT - retrieving resource_access claim with IRS roles. + * * @param jwt source * @return list of roles from token */ public Set extractIrsRolesFromToken(final Jwt jwt) { return Optional.ofNullable(jwt.getClaim(RESOURCE_ACCESS_CLAIM)) - .map(JSONObject.class::cast) - .map(accesses -> accesses.get(IRS_RESOURCE_ACCESS)) - .map(JSONObject.class::cast) - .map(irsAccesses -> irsAccesses.get(ROLES)) - .map(JSONArray.class::cast) - .map(roles -> roles.stream() - .map(String.class::cast) - .map(SimpleGrantedAuthority::new) - .collect(Collectors.toSet())) - .orElse(Collections.emptySet()); + .map(JsonObject.class::cast) + .map(accesses -> accesses.get(IRS_RESOURCE_ACCESS)) + .map(JsonObject.class::cast) + .map(irsAccesses -> irsAccesses.get(ROLES)) + .map(JsonArray.class::cast) + .map(roles -> StreamSupport.stream(roles.spliterator(), false) + .map(JsonPrimitive.class::cast) + .map(JsonPrimitive::getAsString) + .map(SimpleGrantedAuthority::new) + .collect(Collectors.toSet())) + .orElse(Collections.emptySet()); } } diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverterTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverterTest.java index 33c89dbe41..8218a9e8b9 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverterTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverterTest.java @@ -5,11 +5,11 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; -import java.util.List; import java.util.Map; -import com.nimbusds.jose.shaded.json.JSONArray; -import com.nimbusds.jose.shaded.json.JSONObject; +import com.nimbusds.jose.shaded.gson.JsonArray; +import com.nimbusds.jose.shaded.gson.JsonElement; +import com.nimbusds.jose.shaded.gson.JsonObject; import org.junit.jupiter.api.Test; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -22,9 +22,11 @@ class JwtAuthenticationConverterTest { @Test void shouldParseJwtTokenAndFindViewIrsRole() { // given - final JSONArray irsRoles = new JSONArray(); - irsRoles.addAll(List.of("view_irs")); - final Map irsResourceAccess = Map.of("Cl20-CX-IRS", new JSONObject(Map.of("roles", irsRoles))); + final JsonArray irsRoles = new JsonArray(); + irsRoles.add("view_irs"); + final JsonObject jsonObject = new JsonObject(); + jsonObject.add("roles", irsRoles); + final Map irsResourceAccess = Map.of("Cl20-CX-IRS", jsonObject); final Jwt jwt = jwt(irsResourceAccess); // when @@ -39,7 +41,10 @@ void shouldParseJwtTokenAndFindViewIrsRole() { @Test void shouldParseJwtTokenAndNotFindIrsRolesWhenWrongKey() { // given - final Map irsResourceAccess = Map.of("Cl20-CX-IRS-WRONG-KEY", new JSONObject(Map.of("roles", new JSONArray()))); + final JsonObject jsonObject = new JsonObject(); + jsonObject.add("roles", new JsonArray()); + + final Map irsResourceAccess = Map.of("Cl20-CX-IRS-WRONG-KEY", jsonObject); final Jwt jwt = jwt(irsResourceAccess); // when @@ -54,9 +59,11 @@ void shouldParseJwtTokenAndNotFindIrsRolesWhenWrongKey() { @Test void shouldParseJwtTokenAndNotFindIrsRolesWhenWrongRolesKey() { // given - final JSONArray irsRoles = new JSONArray(); - irsRoles.addAll(List.of("view_irs")); - final Map irsResourceAccess = Map.of("Cl20-CX-IRS", new JSONObject(Map.of("rolesWrong", irsRoles))); + final JsonArray irsRoles = new JsonArray(); + irsRoles.add("view_irs"); + final JsonObject jsonObject = new JsonObject(); + jsonObject.add("rolesWrong", irsRoles); + final Map irsResourceAccess = Map.of("Cl20-CX-IRS", jsonObject); final Jwt jwt = jwt(irsResourceAccess); // when @@ -69,9 +76,11 @@ void shouldParseJwtTokenAndNotFindIrsRolesWhenWrongRolesKey() { } Jwt jwt(final Map irsResourceAccess) { - final Map claims = Map.of("resource_access", new JSONObject(irsResourceAccess), SUB, "sub", "clientId", "clientId"); + final JsonObject jsonObject = new JsonObject(); + irsResourceAccess.forEach((k,v) -> jsonObject.add(k, (JsonElement) v)); + final Map claims = Map.of("resource_access", jsonObject, SUB, "sub", + "clientId", "clientId"); - return new Jwt("token", Instant.now(), Instant.now().plusSeconds(30), Map.of("alg", "none"), - claims); + return new Jwt("token", Instant.now(), Instant.now().plusSeconds(30), Map.of("alg", "none"), claims); } } From 2403067d77c719c9f1c5778a77f23f25eb54a235 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 10:20:08 +0000 Subject: [PATCH 03/44] chore(deps): bump junit-bom from 5.9.1 to 5.9.2 Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- cucumber-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cucumber-tests/pom.xml b/cucumber-tests/pom.xml index 049b5253b0..140e5d5ed1 100644 --- a/cucumber-tests/pom.xml +++ b/cucumber-tests/pom.xml @@ -26,7 +26,7 @@ org.junit junit-bom - 5.9.1 + 5.9.2 pom import From 90957775aa90d391caaded19f18f5fdadc235888 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Thu, 23 Feb 2023 14:48:57 +0100 Subject: [PATCH 04/44] feat(impl):[TRI-1028] spring boot 3.0 fixes for jwt converter, swagger impl, dependciens update --- api/irs-v1.0.yaml | 19 +++--- irs-api/pom.xml | 2 +- .../configuration/OpenApiConfiguration.java | 4 +- .../irs/configuration/OpenApiExamples.java | 2 + .../configuration/SecurityConfiguration.java | 4 +- .../converter/JwtAuthenticationConverter.java | 19 +++--- .../irs/controllers/IrsController.java | 4 +- .../JwtAuthenticationConverterTest.java | 63 ++++++++++++------- .../tractusx/irs/component/FetchedItems.java | 5 +- pom.xml | 2 +- 10 files changed, 68 insertions(+), 56 deletions(-) diff --git a/api/irs-v1.0.yaml b/api/irs-v1.0.yaml index 90803bc7f1..44924cb1f9 100644 --- a/api/irs-v1.0.yaml +++ b/api/irs-v1.0.yaml @@ -36,24 +36,19 @@ paths: - description: Zero-based page index (0..N) in: query name: page - required: false schema: type: integer default: 0 - minimum: 0 - description: The size of the page to be returned in: query name: size - required: false schema: type: integer default: 20 - minimum: 1 - description: "Sorting criteria in the format: property,(asc|desc). Default\ \ sort order is ascending. Multiple sort criteria are supported." in: query name: sort - required: false schema: type: array items: @@ -492,6 +487,7 @@ components: processingError: errorDetail: Details to reason of Failure lastAttempt: 2022-02-03T14:48:54.709Z + processStep: SchemaValidation retryCounter: 0 error-response-400: value: @@ -658,6 +654,7 @@ components: processingError: errorDetail: Details to reason of Failure lastAttempt: 2022-02-03T14:48:54.709Z + processStep: SchemaValidation retryCounter: 0 partial-job-result: value: @@ -1134,12 +1131,12 @@ components: processStep: type: string enum: - - SUBMODEL_REQUEST - - DIGITAL_TWIN_REQUEST - - SCHEMA_VALIDATION - - SCHEMA_REQUEST - - BPDM_REQUEST - - BPDM_VALIDATION + - SubmodelRequest + - DigitalTwinRequest + - SchemaValidation + - SchemaRequest + - BpdmRequest + - BpdmValidation retryCounter: type: integer format: int32 diff --git a/irs-api/pom.xml b/irs-api/pom.xml index 2cf9fb2c16..aa75c2390e 100644 --- a/irs-api/pom.xml +++ b/irs-api/pom.xml @@ -122,7 +122,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - 2.0.0 + 2.0.2 org.springframework.boot diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiConfiguration.java index fc045b5f30..8d00cf97b1 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiConfiguration.java @@ -32,7 +32,7 @@ import io.swagger.v3.oas.models.servers.Server; import lombok.RequiredArgsConstructor; import org.eclipse.tractusx.irs.IrsApplication; -import org.springdoc.core.customizers.OpenApiCustomiser; +import org.springdoc.core.customizers.OpenApiCustomizer; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -71,7 +71,7 @@ public OpenAPI customOpenAPI() { * @return the customizer */ @Bean - public OpenApiCustomiser customizer( + public OpenApiCustomizer customizer( @Value("${spring.security.oauth2.client.provider.keycloak.token-uri}") final String tokenUri) { return openApi -> { final Components components = openApi.getComponents(); diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java index a7a4227b18..1a8e0bac0b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java @@ -57,6 +57,7 @@ import org.eclipse.tractusx.irs.component.enums.BomLifecycle; import org.eclipse.tractusx.irs.component.enums.Direction; import org.eclipse.tractusx.irs.component.enums.JobState; +import org.eclipse.tractusx.irs.component.enums.ProcessStep; import org.eclipse.tractusx.irs.dtos.ErrorResponse; import org.eclipse.tractusx.irs.semanticshub.AspectModel; import org.eclipse.tractusx.irs.semanticshub.AspectModels; @@ -255,6 +256,7 @@ private Tombstone createTombstone() { .catenaXId(createGAID(GLOBAL_ASSET_ID).getGlobalAssetId()) .endpointURL("https://catena-x.net/vehicle/partdetails/") .processingError(ProcessingError.builder() + .withProcessStep(ProcessStep.SCHEMA_VALIDATION) .withErrorDetail("Details to reason of Failure") .withLastAttempt(EXAMPLE_ZONED_DATETIME) .withRetryCounter(0) diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java index bb2e24c3e0..31c9d53c37 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java @@ -62,7 +62,7 @@ public class SecurityConfiguration { @SuppressWarnings("PMD.SignatureDeclareThrowsException") @Bean - /* package */ SecurityFilterChain securityFilterChain(final HttpSecurity httpSecurity) throws Exception { + /* package */ SecurityFilterChain securityFilterChain(final HttpSecurity httpSecurity) throws Exception { httpSecurity.httpBasic().disable(); httpSecurity.formLogin().disable(); httpSecurity.csrf().disable(); @@ -98,7 +98,7 @@ public class SecurityConfiguration { } @Bean - /* package */ CorsConfigurationSource corsConfigurationSource() { + /* package */ CorsConfigurationSource corsConfigurationSource() { final CorsConfiguration configuration = new CorsConfiguration(); configuration.setAllowedOriginPatterns(List.of("*")); configuration.setAllowCredentials(true); diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java index 76d59a6753..2f28ed03ca 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java @@ -23,15 +23,13 @@ import java.util.Collection; import java.util.Collections; +import java.util.List; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import java.util.stream.StreamSupport; -import com.nimbusds.jose.shaded.gson.JsonArray; -import com.nimbusds.jose.shaded.gson.JsonObject; -import com.nimbusds.jose.shaded.gson.JsonPrimitive; +import com.nimbusds.jose.shaded.gson.internal.LinkedTreeMap; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.core.convert.converter.Converter; @@ -79,16 +77,13 @@ public AbstractAuthenticationToken convert(final @NotNull Jwt source) { */ public Set extractIrsRolesFromToken(final Jwt jwt) { return Optional.ofNullable(jwt.getClaim(RESOURCE_ACCESS_CLAIM)) - .map(JsonObject.class::cast) + .map(LinkedTreeMap.class::cast) .map(accesses -> accesses.get(IRS_RESOURCE_ACCESS)) - .map(JsonObject.class::cast) + .map(LinkedTreeMap.class::cast) .map(irsAccesses -> irsAccesses.get(ROLES)) - .map(JsonArray.class::cast) - .map(roles -> StreamSupport.stream(roles.spliterator(), false) - .map(JsonPrimitive.class::cast) - .map(JsonPrimitive::getAsString) - .map(SimpleGrantedAuthority::new) - .collect(Collectors.toSet())) + .map(roles -> ((List) roles).stream() + .map(SimpleGrantedAuthority::new) + .collect(Collectors.toSet())) .orElse(Collections.emptySet()); } } diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java index e4589c2858..70d97983e7 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java @@ -56,6 +56,7 @@ import org.eclipse.tractusx.irs.services.SemanticHubService; import org.eclipse.tractusx.irs.services.validation.SchemaNotFoundException; import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.converters.models.PageableAsQueryParam; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; @@ -255,6 +256,7 @@ public Job cancelJobByJobId( }) @IrsTimer("getjobbystate") @GetMapping("/jobs") + @PageableAsQueryParam @PreAuthorize("hasAuthority('view_irs')") public PageResult getJobsByState( @Valid @ParameterObject @Parameter(description = "Requested job states.", in = QUERY, @@ -262,6 +264,7 @@ public PageResult getJobsByState( @RequestParam(value = "states", required = false, defaultValue = "") final List states, @Parameter(hidden = true) @RequestParam(value = "jobStates", required = false, defaultValue = "") final List jobStates, + @Parameter(hidden = true) @ParameterObject final Pageable pageable) { return itemJobService.getJobsByState(states, jobStates, pageable); } @@ -290,7 +293,6 @@ public PageResult getJobsByState( }), }) @GetMapping("/aspectmodels") - @ResponseStatus(HttpStatus.OK) @PreAuthorize("hasAuthority('view_irs')") public AspectModels getAllAvailableAspectModels() throws SchemaNotFoundException { return semanticHubService.getAllAspectModels(); diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverterTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverterTest.java index 8218a9e8b9..653464b9fe 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverterTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverterTest.java @@ -1,3 +1,24 @@ +/******************************************************************************** + * Copyright (c) 2021,2022 + * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022: ZF Friedrichshafen AG + * 2022: ISTOS GmbH + * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://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. + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ package org.eclipse.tractusx.irs.configuration.converter; import static org.springframework.security.oauth2.jwt.JwtClaimNames.SUB; @@ -5,11 +26,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; +import java.util.List; import java.util.Map; -import com.nimbusds.jose.shaded.gson.JsonArray; -import com.nimbusds.jose.shaded.gson.JsonElement; -import com.nimbusds.jose.shaded.gson.JsonObject; +import com.nimbusds.jose.shaded.gson.internal.LinkedTreeMap; import org.junit.jupiter.api.Test; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -22,11 +42,10 @@ class JwtAuthenticationConverterTest { @Test void shouldParseJwtTokenAndFindViewIrsRole() { // given - final JsonArray irsRoles = new JsonArray(); - irsRoles.add("view_irs"); - final JsonObject jsonObject = new JsonObject(); - jsonObject.add("roles", irsRoles); - final Map irsResourceAccess = Map.of("Cl20-CX-IRS", jsonObject); + final Map irsResourceAccess = new LinkedTreeMap<>(); + final Map irsRoles = new LinkedTreeMap<>(); + irsRoles.put("roles", List.of("view_irs")); + irsResourceAccess.put("Cl20-CX-IRS", irsRoles); final Jwt jwt = jwt(irsResourceAccess); // when @@ -41,10 +60,10 @@ void shouldParseJwtTokenAndFindViewIrsRole() { @Test void shouldParseJwtTokenAndNotFindIrsRolesWhenWrongKey() { // given - final JsonObject jsonObject = new JsonObject(); - jsonObject.add("roles", new JsonArray()); - - final Map irsResourceAccess = Map.of("Cl20-CX-IRS-WRONG-KEY", jsonObject); + final Map irsResourceAccess = new LinkedTreeMap<>(); + final Map irsRoles = new LinkedTreeMap<>(); + irsRoles.put("roles", List.of()); + irsResourceAccess.put("Cl20-CX-IRS-WRONG-KEY", irsRoles); final Jwt jwt = jwt(irsResourceAccess); // when @@ -59,11 +78,10 @@ void shouldParseJwtTokenAndNotFindIrsRolesWhenWrongKey() { @Test void shouldParseJwtTokenAndNotFindIrsRolesWhenWrongRolesKey() { // given - final JsonArray irsRoles = new JsonArray(); - irsRoles.add("view_irs"); - final JsonObject jsonObject = new JsonObject(); - jsonObject.add("rolesWrong", irsRoles); - final Map irsResourceAccess = Map.of("Cl20-CX-IRS", jsonObject); + final Map irsResourceAccess = new LinkedTreeMap<>(); + final Map irsRoles = new LinkedTreeMap<>(); + irsRoles.put("rolesWrong", List.of("view_irs")); + irsResourceAccess.put("Cl20-CX-IRS-WRONG-KEY", irsRoles); final Jwt jwt = jwt(irsResourceAccess); // when @@ -76,11 +94,10 @@ void shouldParseJwtTokenAndNotFindIrsRolesWhenWrongRolesKey() { } Jwt jwt(final Map irsResourceAccess) { - final JsonObject jsonObject = new JsonObject(); - irsResourceAccess.forEach((k,v) -> jsonObject.add(k, (JsonElement) v)); - final Map claims = Map.of("resource_access", jsonObject, SUB, "sub", - "clientId", "clientId"); + final Map claims = new LinkedTreeMap<>(); + claims.putAll(Map.of("resource_access", irsResourceAccess, SUB, "sub", "clientId", "clientId")); - return new Jwt("token", Instant.now(), Instant.now().plusSeconds(30), Map.of("alg", "none"), claims); + return new Jwt("token", Instant.now(), Instant.now().plusSeconds(30), Map.of("alg", "none"), + claims); } -} +} \ No newline at end of file diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java index 3a475de640..b179c30dd5 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java @@ -21,10 +21,9 @@ ********************************************************************************/ package org.eclipse.tractusx.irs.component; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.Builder; import lombok.Value; import lombok.extern.jackson.Jacksonized; diff --git a/pom.xml b/pom.xml index f3494fcb6b..423d364f35 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ - 3.0.1 + 3.0.2 3.1.5 1.6.7 1.10.0 From 11ef004dd806ae18b5f55dfff2317d02dc0194ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:17:16 +0000 Subject: [PATCH 05/44] chore(deps): bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/spectral.yaml | 2 +- .github/workflows/swagger-editor-validate.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spectral.yaml b/.github/workflows/spectral.yaml index a71e4eca98..b3ad011401 100644 --- a/.github/workflows/spectral.yaml +++ b/.github/workflows/spectral.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: # Check out the repository - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Run Spectral - uses: stoplightio/spectral-action@latest diff --git a/.github/workflows/swagger-editor-validate.yml b/.github/workflows/swagger-editor-validate.yml index 45afbb829e..3f6d3888cd 100644 --- a/.github/workflows/swagger-editor-validate.yml +++ b/.github/workflows/swagger-editor-validate.yml @@ -15,7 +15,7 @@ jobs: name: Swagger Editor Validator Remote steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Validate OpenAPI definition uses: char0n/swagger-editor-validate@v1 with: From 6c72e9cc2b6012163e692aa27c2abad21970d87c Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Mon, 27 Feb 2023 14:51:47 +0100 Subject: [PATCH 06/44] feat(impl):[TRI-1068] update legal header in classes --- ci/irs.header | 7 ++++--- ci/pmd-rules.xml | 2 +- .../tractusx/irs/cucumber/AuthenticationProperties.java | 7 ++++--- .../tractusx/irs/cucumber/E2ETestStepDefinitions.java | 7 ++++--- .../tractusx/irs/configuration/SmokeTestConfiguration.java | 7 ++++--- .../irs/configuration/SmokeTestConnectionProperties.java | 7 ++++--- .../irs/configuration/SmokeTestCredentialsProperties.java | 7 ++++--- .../eclipse/tractusx/irs/smoketest/ItemGraphSmokeTest.java | 7 ++++--- .../main/java/org/eclipse/tractusx/irs/IrsApplication.java | 7 ++++--- .../irs/aaswrapper/job/AASRecursiveJobHandler.java | 7 ++++--- .../tractusx/irs/aaswrapper/job/AASTransferProcess.java | 7 ++++--- .../irs/aaswrapper/job/AASTransferProcessManager.java | 7 ++++--- .../eclipse/tractusx/irs/aaswrapper/job/ItemContainer.java | 7 ++++--- .../tractusx/irs/aaswrapper/job/ItemDataRequest.java | 7 ++++--- .../tractusx/irs/aaswrapper/job/ItemTreesAssembler.java | 7 ++++--- .../irs/aaswrapper/job/JobProcessingEventListener.java | 7 ++++--- .../irs/aaswrapper/job/JobProcessingFinishedEvent.java | 7 ++++--- .../eclipse/tractusx/irs/aaswrapper/job/RequestMetric.java | 7 ++++--- .../tractusx/irs/aaswrapper/job/TreeRecursiveLogic.java | 7 ++++--- .../irs/aaswrapper/job/delegate/AbstractDelegate.java | 7 ++++--- .../tractusx/irs/aaswrapper/job/delegate/BpdmDelegate.java | 7 ++++--- .../job/delegate/BpdmDelegateProcessingException.java | 7 ++++--- .../irs/aaswrapper/job/delegate/DigitalTwinDelegate.java | 7 ++++--- .../irs/aaswrapper/job/delegate/RelationshipDelegate.java | 7 ++++--- .../irs/aaswrapper/job/delegate/SubmodelDelegate.java | 7 ++++--- .../domain/AssetAdministrationShellTestdataCreator.java | 7 ++++--- .../registry/domain/DigitalTwinRegistryClient.java | 7 ++++--- .../registry/domain/DigitalTwinRegistryFacade.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/bpdm/BpdmClient.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/bpdm/BpdmFacade.java | 7 ++++--- .../eclipse/tractusx/irs/bpdm/BusinessPartnerResponse.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/bpdm/NameResponse.java | 7 ++++--- .../tractusx/irs/configuration/BlobstoreConfiguration.java | 7 ++++--- .../tractusx/irs/configuration/EdcConfiguration.java | 7 ++++--- .../tractusx/irs/configuration/IrsConfiguration.java | 7 ++++--- .../tractusx/irs/configuration/JobConfiguration.java | 7 ++++--- .../tractusx/irs/configuration/MinioHealthIndicator.java | 7 ++++--- .../tractusx/irs/configuration/OpenApiConfiguration.java | 7 ++++--- .../tractusx/irs/configuration/OpenApiExamples.java | 7 ++++--- .../tractusx/irs/configuration/RestTemplateConfig.java | 7 ++++--- .../tractusx/irs/configuration/SecurityConfiguration.java | 7 ++++--- .../irs/configuration/SemanticsHubConfiguration.java | 7 ++++--- .../tractusx/irs/configuration/TrustedEndpointsFilter.java | 7 ++++--- .../irs/configuration/TrustedPortConfiguration.java | 7 ++++--- .../converter/JwtAuthenticationConverter.java | 7 ++++--- .../irs/configuration/local/CxTestDataContainer.java | 7 ++++--- .../configuration/local/LocalTestDataConfiguration.java | 7 ++++--- .../eclipse/tractusx/irs/connector/job/BaseJobStore.java | 7 ++++--- .../eclipse/tractusx/irs/connector/job/DataRequest.java | 7 ++++--- .../tractusx/irs/connector/job/InMemoryJobStore.java | 7 ++++--- .../org/eclipse/tractusx/irs/connector/job/IrsTimer.java | 7 ++++--- .../eclipse/tractusx/irs/connector/job/IrsTimerAspect.java | 7 ++++--- .../eclipse/tractusx/irs/connector/job/JobException.java | 7 ++++--- .../tractusx/irs/connector/job/JobInitiateResponse.java | 7 ++++--- .../tractusx/irs/connector/job/JobOrchestrator.java | 7 ++++--- .../org/eclipse/tractusx/irs/connector/job/JobStore.java | 7 ++++--- .../org/eclipse/tractusx/irs/connector/job/JobTTL.java | 7 ++++--- .../tractusx/irs/connector/job/MultiTransferJob.java | 7 ++++--- .../tractusx/irs/connector/job/PersistentJobStore.java | 7 ++++--- .../tractusx/irs/connector/job/RecursiveJobHandler.java | 7 ++++--- .../eclipse/tractusx/irs/connector/job/ResponseStatus.java | 7 ++++--- .../irs/connector/job/TransferInitiateResponse.java | 7 ++++--- .../tractusx/irs/connector/job/TransferProcess.java | 7 ++++--- .../tractusx/irs/connector/job/TransferProcessManager.java | 7 ++++--- .../eclipse/tractusx/irs/controllers/IrsAppConstants.java | 7 ++++--- .../eclipse/tractusx/irs/controllers/IrsController.java | 7 ++++--- .../tractusx/irs/controllers/IrsExceptionHandler.java | 7 ++++--- .../eclipse/tractusx/irs/edc/AssemblyPartRelationship.java | 7 ++++--- .../tractusx/irs/edc/ContractNegotiationService.java | 7 ++++--- .../eclipse/tractusx/irs/edc/EdcCallbackController.java | 7 ++++--- .../eclipse/tractusx/irs/edc/EdcControlPlaneClient.java | 7 ++++--- .../org/eclipse/tractusx/irs/edc/EdcDataPlaneClient.java | 7 ++++--- .../org/eclipse/tractusx/irs/edc/EdcSubmodelClient.java | 7 ++++--- .../org/eclipse/tractusx/irs/edc/EdcSubmodelFacade.java | 7 ++++--- .../tractusx/irs/edc/EndpointDataReferenceStorage.java | 7 ++++--- .../org/eclipse/tractusx/irs/edc/RelationshipAspect.java | 7 ++++--- .../org/eclipse/tractusx/irs/edc/RelationshipSubmodel.java | 7 ++++--- .../eclipse/tractusx/irs/edc/SingleLevelBomAsPlanned.java | 7 ++++--- .../eclipse/tractusx/irs/edc/SingleLevelUsageAsBuilt.java | 7 ++++--- .../eclipse/tractusx/irs/edc/SubmodelTestdataCreator.java | 7 ++++--- .../irs/edc/model/ContractOfferInCatalogResponse.java | 7 ++++--- .../tractusx/irs/edc/model/ContractOfferRequest.java | 7 ++++--- .../org/eclipse/tractusx/irs/edc/model/NegotiationId.java | 7 ++++--- .../eclipse/tractusx/irs/edc/model/NegotiationRequest.java | 7 ++++--- .../tractusx/irs/edc/model/NegotiationResponse.java | 7 ++++--- .../irs/edc/model/TransferProcessDataDestination.java | 7 ++++--- .../eclipse/tractusx/irs/edc/model/TransferProcessId.java | 7 ++++--- .../tractusx/irs/edc/model/TransferProcessRequest.java | 7 ++++--- .../tractusx/irs/edc/model/TransferProcessResponse.java | 7 ++++--- .../irs/exceptions/ContractNegotiationException.java | 7 ++++--- .../tractusx/irs/exceptions/EdcClientException.java | 7 ++++--- .../tractusx/irs/exceptions/EntityNotFoundException.java | 7 ++++--- .../tractusx/irs/exceptions/JsonParseException.java | 7 ++++--- .../eclipse/tractusx/irs/exceptions/TimeoutException.java | 7 ++++--- .../eclipse/tractusx/irs/persistence/BlobPersistence.java | 7 ++++--- .../tractusx/irs/persistence/BlobPersistenceException.java | 7 ++++--- .../tractusx/irs/persistence/MinioBlobPersistence.java | 7 ++++--- .../org/eclipse/tractusx/irs/semanticshub/AspectModel.java | 7 ++++--- .../eclipse/tractusx/irs/semanticshub/AspectModels.java | 7 ++++--- .../tractusx/irs/semanticshub/PaginatedResponse.java | 7 ++++--- .../irs/semanticshub/SemanticsHubCacheInitializer.java | 7 ++++--- .../tractusx/irs/semanticshub/SemanticsHubClient.java | 7 ++++--- .../tractusx/irs/semanticshub/SemanticsHubFacade.java | 7 ++++--- .../eclipse/tractusx/irs/services/AsyncPollingService.java | 7 ++++--- .../tractusx/irs/services/IIrsItemGraphQueryService.java | 7 ++++--- .../tractusx/irs/services/IrsItemGraphQueryService.java | 7 ++++--- .../tractusx/irs/services/MeterRegistryService.java | 7 ++++--- .../irs/services/OutboundMeterRegistryService.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/services/PollingJob.java | 7 ++++--- .../tractusx/irs/services/SecurityHelperService.java | 7 ++++--- .../eclipse/tractusx/irs/services/SemanticHubService.java | 7 ++++--- .../irs/services/validation/InvalidSchemaException.java | 7 ++++--- .../irs/services/validation/JsonValidatorService.java | 7 ++++--- .../irs/services/validation/SchemaNotFoundException.java | 7 ++++--- .../tractusx/irs/services/validation/ValidationResult.java | 7 ++++--- .../eclipse/tractusx/irs/util/CustomUriTagProvider.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/util/JobMetrics.java | 7 ++++--- .../main/java/org/eclipse/tractusx/irs/util/JsonUtil.java | 7 ++++--- .../org/eclipse/tractusx/irs/util/RunnableDecorator.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/InMemoryBlobStore.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/IrsApplicationTests.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/IrsFunctionalTest.java | 7 ++++--- .../src/test/java/org/eclipse/tractusx/irs/TestConfig.java | 7 ++++--- .../irs/aaswrapper/job/AASTransferProcessManagerTest.java | 7 ++++--- .../irs/aaswrapper/job/delegate/BpdmDelegateTest.java | 7 ++++--- .../aaswrapper/job/delegate/DigitalTwinDelegateTest.java | 7 ++++--- .../aaswrapper/job/delegate/RelationshipDelegateTest.java | 7 ++++--- .../irs/aaswrapper/job/delegate/SubmodelDelegateTest.java | 7 ++++--- .../AssetAdministrationShellTestdataCreatorTest.java | 7 ++++--- .../registry/domain/DigitalTwinRegistryClientImplTest.java | 7 ++++--- .../domain/DigitalTwinRegistryExponentialRetryTest.java | 7 ++++--- .../registry/domain/DigitalTwinRegistryFacadeTest.java | 7 ++++--- .../org/eclipse/tractusx/irs/bpdm/BpdmClientImplTest.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/bpdm/BpdmFacadeTest.java | 7 ++++--- .../tractusx/irs/component/tombstone/TombStoneTest.java | 7 ++++--- .../irs/configuration/MinioHealthIndicatorTest.java | 7 ++++--- .../irs/configuration/TrustedEndpointsFilterTest.java | 7 ++++--- .../irs/configuration/TrustedPortConfigurationTest.java | 7 ++++--- .../tractusx/irs/connector/job/InMemoryJobStoreTest.java | 7 ++++--- .../tractusx/irs/connector/job/JobOrchestratorTest.java | 7 ++++--- .../tractusx/irs/connector/job/MultiTransferJobTest.java | 7 ++++--- .../tractusx/irs/connector/job/PersistentJobStoreTest.java | 7 ++++--- .../tractusx/irs/controllers/IrsControllerTest.java | 7 ++++--- .../tractusx/irs/controllers/IrsExceptionHandlerTest.java | 7 ++++--- .../AssetAdministrationShellDescriptorTest.java | 7 ++++--- .../tractusx/irs/edc/ContractNegotiationServiceTest.java | 7 ++++--- .../eclipse/tractusx/irs/edc/CxTestDataAnalyzerTest.java | 7 ++++--- .../tractusx/irs/edc/EdcCallbackControllerTest.java | 7 ++++--- .../tractusx/irs/edc/EdcControlPlaneClientTest.java | 7 ++++--- .../eclipse/tractusx/irs/edc/EdcDataPlaneClientTest.java | 7 ++++--- .../eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java | 7 ++++--- .../eclipse/tractusx/irs/edc/EdcSubmodelFacadeTest.java | 7 ++++--- .../eclipse/tractusx/irs/edc/RelationshipAspectTest.java | 7 ++++--- .../tractusx/irs/edc/SubmodelFacadeWiremockTest.java | 7 ++++--- .../org/eclipse/tractusx/irs/edc/SubmodelRetryerTest.java | 7 ++++--- .../tractusx/irs/edc/SubmodelTestdataCreatorTest.java | 7 ++++--- .../tractusx/irs/persistence/MinioBlobPersistenceTest.java | 7 ++++--- .../irs/semanticshub/SemanticHubCacheInitializerTests.java | 7 ++++--- .../tractusx/irs/semanticshub/SemanticHubWiremockTest.java | 7 ++++--- .../irs/semanticshub/SemanticsHubClientImplTest.java | 7 ++++--- .../tractusx/irs/semanticshub/SemanticsHubFacadeTest.java | 7 ++++--- .../services/IrsItemGraphQueryServiceSpringBootTest.java | 7 ++++--- .../irs/services/IrsItemGraphQueryServiceTest.java | 7 ++++--- .../tractusx/irs/services/MeterRegistryServiceTest.java | 7 ++++--- .../irs/services/OutboundMeterRegistryServiceTest.java | 7 ++++--- .../tractusx/irs/services/SecurityHelperServiceTest.java | 7 ++++--- .../irs/services/validation/JsonValidatorServiceTest.java | 7 ++++--- .../eclipse/tractusx/irs/util/JobResponseAnalyzerTest.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/util/JsonUtilTest.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/util/TestMother.java | 7 ++++--- .../eclipse/tractusx/irs/component/AsyncFetchedItems.java | 7 ++++--- .../main/java/org/eclipse/tractusx/irs/component/Bpn.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/Description.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/component/Endpoint.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/FetchedItems.java | 7 ++++--- .../eclipse/tractusx/irs/component/GenericDescription.java | 7 ++++--- .../tractusx/irs/component/GlobalAssetIdentification.java | 7 ++++--- .../eclipse/tractusx/irs/component/IStatusCodeEnum.java | 7 ++++--- .../main/java/org/eclipse/tractusx/irs/component/Job.java | 7 ++++--- .../eclipse/tractusx/irs/component/JobErrorDetails.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/component/JobHandle.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/JobParameter.java | 7 ++++--- .../eclipse/tractusx/irs/component/JobStatusResult.java | 7 ++++--- .../main/java/org/eclipse/tractusx/irs/component/Jobs.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/LinkedItem.java | 7 ++++--- .../eclipse/tractusx/irs/component/MeasurementUnit.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/PageResult.java | 7 ++++--- .../eclipse/tractusx/irs/component/ProcessingError.java | 7 ++++--- .../tractusx/irs/component/ProtocolInformation.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/component/Quantity.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/RegisterJob.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/Relationship.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/SemanticId.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/component/Shell.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/component/Submodel.java | 7 ++++--- .../eclipse/tractusx/irs/component/SubmodelDescriptor.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/component/Summary.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/component/Tombstone.java | 7 ++++--- .../AdministrativeInformation.java | 7 ++++--- .../AssetAdministrationShellDescriptor.java | 7 ++++--- .../irs/component/assetadministrationshell/Endpoint.java | 7 ++++--- .../assetadministrationshell/IdentifierKeyValuePair.java | 7 ++++--- .../irs/component/assetadministrationshell/LangString.java | 7 ++++--- .../assetadministrationshell/ProtocolInformation.java | 7 ++++--- .../irs/component/assetadministrationshell/Reference.java | 7 ++++--- .../assetadministrationshell/SubmodelDescriptor.java | 7 ++++--- .../eclipse/tractusx/irs/component/enums/AspectType.java | 7 ++++--- .../eclipse/tractusx/irs/component/enums/BomLifecycle.java | 7 ++++--- .../eclipse/tractusx/irs/component/enums/Direction.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/enums/JobState.java | 7 ++++--- .../org/eclipse/tractusx/irs/component/enums/NodeType.java | 7 ++++--- .../eclipse/tractusx/irs/component/enums/ProcessStep.java | 7 ++++--- .../tractusx/irs/component/enums/StatusCodeEnum.java | 7 ++++--- .../java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java | 7 ++++--- .../tractusx/irs/testing/containers/MinioContainer.java | 7 ++++--- 215 files changed, 857 insertions(+), 643 deletions(-) diff --git a/ci/irs.header b/ci/irs.header index de0d3db064..3be2943f52 100644 --- a/ci/irs.header +++ b/ci/irs.header @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/ci/pmd-rules.xml b/ci/pmd-rules.xml index d562922ca2..7667fc73ee 100644 --- a/ci/pmd-rules.xml +++ b/ci/pmd-rules.xml @@ -56,7 +56,7 @@ - + diff --git a/cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/AuthenticationProperties.java b/cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/AuthenticationProperties.java index 154d86be58..f5d58f2e4e 100644 --- a/cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/AuthenticationProperties.java +++ b/cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/AuthenticationProperties.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitions.java b/cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitions.java index c0d0b7ef86..3bb2a00447 100644 --- a/cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitions.java +++ b/cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestStepDefinitions.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConfiguration.java b/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConfiguration.java index 62267e0560..969e35bc20 100644 --- a/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConfiguration.java +++ b/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConnectionProperties.java b/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConnectionProperties.java index 2b99d8c020..34999b1ec1 100644 --- a/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConnectionProperties.java +++ b/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConnectionProperties.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestCredentialsProperties.java b/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestCredentialsProperties.java index debdf7eb2b..df93fe2f13 100644 --- a/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestCredentialsProperties.java +++ b/integration-tests/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestCredentialsProperties.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/integration-tests/src/test/java/org/eclipse/tractusx/irs/smoketest/ItemGraphSmokeTest.java b/integration-tests/src/test/java/org/eclipse/tractusx/irs/smoketest/ItemGraphSmokeTest.java index 8246d1aa59..8a60d046da 100644 --- a/integration-tests/src/test/java/org/eclipse/tractusx/irs/smoketest/ItemGraphSmokeTest.java +++ b/integration-tests/src/test/java/org/eclipse/tractusx/irs/smoketest/ItemGraphSmokeTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/IrsApplication.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/IrsApplication.java index 74ba89d652..f30937952f 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/IrsApplication.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/IrsApplication.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASRecursiveJobHandler.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASRecursiveJobHandler.java index 9a55987b13..c997a7aac4 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASRecursiveJobHandler.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASRecursiveJobHandler.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcess.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcess.java index 9f40c5a742..109a4704ba 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcess.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcess.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManager.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManager.java index a4549138ee..63d2441200 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManager.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManager.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemContainer.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemContainer.java index adae76a38c..3505f1865e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemContainer.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemContainer.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemDataRequest.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemDataRequest.java index 732a635b98..c55dedbfe8 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemDataRequest.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemDataRequest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemTreesAssembler.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemTreesAssembler.java index 866db84893..a3b72c93c7 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemTreesAssembler.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/ItemTreesAssembler.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/JobProcessingEventListener.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/JobProcessingEventListener.java index 82ba9136ab..32f0e9d6c0 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/JobProcessingEventListener.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/JobProcessingEventListener.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/JobProcessingFinishedEvent.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/JobProcessingFinishedEvent.java index 937b0d1788..c288372684 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/JobProcessingFinishedEvent.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/JobProcessingFinishedEvent.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/RequestMetric.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/RequestMetric.java index 6156969065..e3199c96b3 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/RequestMetric.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/RequestMetric.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/TreeRecursiveLogic.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/TreeRecursiveLogic.java index bc58604224..eec298d5da 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/TreeRecursiveLogic.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/TreeRecursiveLogic.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/AbstractDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/AbstractDelegate.java index c342bfa020..2a1d364f5e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/AbstractDelegate.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/AbstractDelegate.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegate.java index c0dcc88ce2..c9ca366a35 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegate.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegate.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegateProcessingException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegateProcessingException.java index bc0bc841c6..fda605e793 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegateProcessingException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegateProcessingException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java index 0626e0a804..7abf179d02 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegate.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/RelationshipDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/RelationshipDelegate.java index 6fd8d5f1b8..b61c5f5e1a 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/RelationshipDelegate.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/RelationshipDelegate.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java index 6320819993..1feab41d0e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegate.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/AssetAdministrationShellTestdataCreator.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/AssetAdministrationShellTestdataCreator.java index 643f831b53..55a18ade47 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/AssetAdministrationShellTestdataCreator.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/AssetAdministrationShellTestdataCreator.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryClient.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryClient.java index 703235f2f8..fdbc99b2f2 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryClient.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryClient.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryFacade.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryFacade.java index 2ccda76692..061f4e71ad 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryFacade.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryFacade.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BpdmClient.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BpdmClient.java index 1fcf979020..a422674da6 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BpdmClient.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BpdmClient.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BpdmFacade.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BpdmFacade.java index 707e8ceae2..ec31b051ec 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BpdmFacade.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BpdmFacade.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BusinessPartnerResponse.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BusinessPartnerResponse.java index 5dbdb072bc..88a3fc6c28 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BusinessPartnerResponse.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/BusinessPartnerResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/NameResponse.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/NameResponse.java index 37c06f9c81..97eeefa844 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/NameResponse.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/bpdm/NameResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/BlobstoreConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/BlobstoreConfiguration.java index f9f351494d..38f5bf5488 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/BlobstoreConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/BlobstoreConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/EdcConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/EdcConfiguration.java index 1041d6c8dd..7f280abab1 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/EdcConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/EdcConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/IrsConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/IrsConfiguration.java index 4d9a2f13e3..2f3d43057c 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/IrsConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/IrsConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/JobConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/JobConfiguration.java index 6e413b396b..04b106cd41 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/JobConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/JobConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicator.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicator.java index 45e3fc6c9f..d80400db78 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicator.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicator.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiConfiguration.java index fc045b5f30..7527821927 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java index a7a4227b18..d6dfc72b9e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/OpenApiExamples.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/RestTemplateConfig.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/RestTemplateConfig.java index c37fce02d1..3d2316c2d8 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/RestTemplateConfig.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/RestTemplateConfig.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java index dc2e6746a5..e52fcd6ae7 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SecurityConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SemanticsHubConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SemanticsHubConfiguration.java index 62a9d74a2d..0cd1c0f61e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SemanticsHubConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/SemanticsHubConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilter.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilter.java index 24c3b8333b..701ec602fa 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilter.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilter.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedPortConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedPortConfiguration.java index 05ca4f92e9..3ca7652b40 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedPortConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/TrustedPortConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java index bb29f52bbb..28f19998f7 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/converter/JwtAuthenticationConverter.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/local/CxTestDataContainer.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/local/CxTestDataContainer.java index 4c9761733b..13c21d6e11 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/local/CxTestDataContainer.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/local/CxTestDataContainer.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/local/LocalTestDataConfiguration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/local/LocalTestDataConfiguration.java index 491047aa53..a5bb180b7c 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/local/LocalTestDataConfiguration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/configuration/local/LocalTestDataConfiguration.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/BaseJobStore.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/BaseJobStore.java index 0edce4aea2..0e89fb10fa 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/BaseJobStore.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/BaseJobStore.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/DataRequest.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/DataRequest.java index c1e1e32971..469a8d6437 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/DataRequest.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/DataRequest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/InMemoryJobStore.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/InMemoryJobStore.java index 746d467d2a..c43e189c34 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/InMemoryJobStore.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/InMemoryJobStore.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/IrsTimer.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/IrsTimer.java index 7228a1def6..576eb2e51c 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/IrsTimer.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/IrsTimer.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/IrsTimerAspect.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/IrsTimerAspect.java index d3ffaffdd9..a1f78630ef 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/IrsTimerAspect.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/IrsTimerAspect.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobException.java index 9a3832ec4a..84e2cafd0e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobInitiateResponse.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobInitiateResponse.java index 743507b6ea..85c7153b21 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobInitiateResponse.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobInitiateResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobOrchestrator.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobOrchestrator.java index d844f42273..c08dbcce25 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobOrchestrator.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobOrchestrator.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobStore.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobStore.java index 5c5f1ccd68..8fbabda6bd 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobStore.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobStore.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobTTL.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobTTL.java index e6b0fa6c41..132506d9ce 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobTTL.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/JobTTL.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/MultiTransferJob.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/MultiTransferJob.java index dd36512bd8..459ab1e4bc 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/MultiTransferJob.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/MultiTransferJob.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStore.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStore.java index e4aa72942a..0da3df1e79 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStore.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStore.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/RecursiveJobHandler.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/RecursiveJobHandler.java index 5969d38bbb..e458038411 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/RecursiveJobHandler.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/RecursiveJobHandler.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/ResponseStatus.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/ResponseStatus.java index 379c9913db..cf83e60309 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/ResponseStatus.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/ResponseStatus.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferInitiateResponse.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferInitiateResponse.java index 6d8a3b9d29..1cbd48ef30 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferInitiateResponse.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferInitiateResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferProcess.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferProcess.java index 03765aa570..2b2f5ad74c 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferProcess.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferProcess.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferProcessManager.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferProcessManager.java index 6539e469b9..b5b6ad9a62 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferProcessManager.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/connector/job/TransferProcessManager.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsAppConstants.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsAppConstants.java index a0355f7649..5ce472987f 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsAppConstants.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsAppConstants.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java index 60039b97a1..89ece0402b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsController.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsExceptionHandler.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsExceptionHandler.java index d7938c02bb..f4531a3d1f 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsExceptionHandler.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/controllers/IrsExceptionHandler.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/AssemblyPartRelationship.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/AssemblyPartRelationship.java index 976b085d5a..19c4c4dced 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/AssemblyPartRelationship.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/AssemblyPartRelationship.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/ContractNegotiationService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/ContractNegotiationService.java index ed2d5f3d11..ba24d26ce6 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/ContractNegotiationService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/ContractNegotiationService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcCallbackController.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcCallbackController.java index 363ea9310d..3af9719d77 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcCallbackController.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcCallbackController.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcControlPlaneClient.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcControlPlaneClient.java index 0bee79243e..19c7de15cf 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcControlPlaneClient.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcControlPlaneClient.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcDataPlaneClient.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcDataPlaneClient.java index 6a75d88d0a..262c91317e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcDataPlaneClient.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcDataPlaneClient.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClient.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClient.java index 4e31342f26..cd1a629552 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClient.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClient.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcSubmodelFacade.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcSubmodelFacade.java index f62874b243..48f02da50b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcSubmodelFacade.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EdcSubmodelFacade.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EndpointDataReferenceStorage.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EndpointDataReferenceStorage.java index 5f608c1287..211c694cd2 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EndpointDataReferenceStorage.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/EndpointDataReferenceStorage.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/RelationshipAspect.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/RelationshipAspect.java index d9fc5f789c..a7ad266c41 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/RelationshipAspect.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/RelationshipAspect.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/RelationshipSubmodel.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/RelationshipSubmodel.java index d0a587723c..ba30dee57b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/RelationshipSubmodel.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/RelationshipSubmodel.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SingleLevelBomAsPlanned.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SingleLevelBomAsPlanned.java index 1b2d8bbefa..aba9f14851 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SingleLevelBomAsPlanned.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SingleLevelBomAsPlanned.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SingleLevelUsageAsBuilt.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SingleLevelUsageAsBuilt.java index e018cf7030..01f801149d 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SingleLevelUsageAsBuilt.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SingleLevelUsageAsBuilt.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SubmodelTestdataCreator.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SubmodelTestdataCreator.java index 28e00e2d86..7322426294 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SubmodelTestdataCreator.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/SubmodelTestdataCreator.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/ContractOfferInCatalogResponse.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/ContractOfferInCatalogResponse.java index 79622d1e05..67c354e86e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/ContractOfferInCatalogResponse.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/ContractOfferInCatalogResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/ContractOfferRequest.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/ContractOfferRequest.java index f46131b48c..746537f7ed 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/ContractOfferRequest.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/ContractOfferRequest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationId.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationId.java index ccabcb82d5..130341dc8b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationId.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationId.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationRequest.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationRequest.java index 98dcfe7c45..279c3802fd 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationRequest.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationRequest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationResponse.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationResponse.java index 695837239d..3491e36c4b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationResponse.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/NegotiationResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessDataDestination.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessDataDestination.java index 33d6a8110e..44cea56ba9 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessDataDestination.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessDataDestination.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessId.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessId.java index 8733e061a2..05ed74cce6 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessId.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessId.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessRequest.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessRequest.java index 8abd3fc691..26df293c5b 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessRequest.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessRequest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessResponse.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessResponse.java index 834853d680..55d3d7b605 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessResponse.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/edc/model/TransferProcessResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/ContractNegotiationException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/ContractNegotiationException.java index 206ae3b36d..51ac67e6e4 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/ContractNegotiationException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/ContractNegotiationException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/EdcClientException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/EdcClientException.java index 3755639b57..b747e45c98 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/EdcClientException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/EdcClientException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/EntityNotFoundException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/EntityNotFoundException.java index 39ab5898ed..24ba780a42 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/EntityNotFoundException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/EntityNotFoundException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/JsonParseException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/JsonParseException.java index 204811a426..9ec3ba136e 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/JsonParseException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/JsonParseException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/TimeoutException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/TimeoutException.java index 7580038da0..71b457995c 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/TimeoutException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/exceptions/TimeoutException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/BlobPersistence.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/BlobPersistence.java index 15555c3e8c..f26f121231 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/BlobPersistence.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/BlobPersistence.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/BlobPersistenceException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/BlobPersistenceException.java index 949a347c63..e8bfc10b6d 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/BlobPersistenceException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/BlobPersistenceException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/MinioBlobPersistence.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/MinioBlobPersistence.java index da026417be..f5e968e2bc 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/MinioBlobPersistence.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/persistence/MinioBlobPersistence.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/AspectModel.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/AspectModel.java index 7ea457b9e2..0a465e3ecf 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/AspectModel.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/AspectModel.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/AspectModels.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/AspectModels.java index 427e7f94ff..d68f214eef 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/AspectModels.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/AspectModels.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/PaginatedResponse.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/PaginatedResponse.java index ac4e8bfdd7..ba98ea3549 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/PaginatedResponse.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/PaginatedResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubCacheInitializer.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubCacheInitializer.java index c11658dde6..fb652cc341 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubCacheInitializer.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubCacheInitializer.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubClient.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubClient.java index 7307751313..83e9a9414c 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubClient.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubClient.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubFacade.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubFacade.java index aef504f394..0a16274900 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubFacade.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubFacade.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/AsyncPollingService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/AsyncPollingService.java index db95e71059..449e0424d9 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/AsyncPollingService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/AsyncPollingService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IIrsItemGraphQueryService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IIrsItemGraphQueryService.java index 77a567173f..63d15c6e78 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IIrsItemGraphQueryService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IIrsItemGraphQueryService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java index a5e30b5a46..4073d5c6b8 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/MeterRegistryService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/MeterRegistryService.java index 197e7cbf4e..2e72db7ac4 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/MeterRegistryService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/MeterRegistryService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryService.java index f24672ed22..9b65f1d457 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/PollingJob.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/PollingJob.java index baf033d1dc..36b4ea9edc 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/PollingJob.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/PollingJob.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/SecurityHelperService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/SecurityHelperService.java index 6c06923e8b..8c1fa18477 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/SecurityHelperService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/SecurityHelperService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/SemanticHubService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/SemanticHubService.java index cb79e4c316..3a4657b7f0 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/SemanticHubService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/SemanticHubService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/InvalidSchemaException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/InvalidSchemaException.java index 66fe5f2d0d..d1dfb59c20 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/InvalidSchemaException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/InvalidSchemaException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/JsonValidatorService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/JsonValidatorService.java index 30c3f2f688..d1a43046d0 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/JsonValidatorService.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/JsonValidatorService.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/SchemaNotFoundException.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/SchemaNotFoundException.java index d6614fb511..d9ed3f07da 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/SchemaNotFoundException.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/SchemaNotFoundException.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/ValidationResult.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/ValidationResult.java index 92646d57ca..6de8ebb9ae 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/ValidationResult.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/validation/ValidationResult.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/util/CustomUriTagProvider.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/util/CustomUriTagProvider.java index 076dba0b6c..18939bd6d0 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/util/CustomUriTagProvider.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/util/CustomUriTagProvider.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/util/JobMetrics.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/util/JobMetrics.java index 22faf24438..15f15c9e3d 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/util/JobMetrics.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/util/JobMetrics.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/util/JsonUtil.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/util/JsonUtil.java index cdf6a72966..16b4822c68 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/util/JsonUtil.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/util/JsonUtil.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/util/RunnableDecorator.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/util/RunnableDecorator.java index 02ff057662..04f17851aa 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/util/RunnableDecorator.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/util/RunnableDecorator.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/InMemoryBlobStore.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/InMemoryBlobStore.java index 775b8912c1..d6772c289a 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/InMemoryBlobStore.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/InMemoryBlobStore.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsApplicationTests.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsApplicationTests.java index 3cdcebbd3b..cc75d9af13 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsApplicationTests.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsApplicationTests.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsFunctionalTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsFunctionalTest.java index d95b970ccb..943005f021 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsFunctionalTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsFunctionalTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/TestConfig.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/TestConfig.java index 62f5bdf7bb..b87a5ad249 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/TestConfig.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/TestConfig.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManagerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManagerTest.java index 9ec96f55e8..40cc2730d9 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManagerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/AASTransferProcessManagerTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegateTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegateTest.java index ad1cbd5c5e..ff2a4ec3d1 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegateTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/BpdmDelegateTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java index a1ec7aa123..6db52d109c 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/DigitalTwinDelegateTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/RelationshipDelegateTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/RelationshipDelegateTest.java index cffccc340b..19ebc69d8b 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/RelationshipDelegateTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/RelationshipDelegateTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java index 39ae4bc798..f71756d66f 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/job/delegate/SubmodelDelegateTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/AssetAdministrationShellTestdataCreatorTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/AssetAdministrationShellTestdataCreatorTest.java index ed9496d575..2356b3b991 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/AssetAdministrationShellTestdataCreatorTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/AssetAdministrationShellTestdataCreatorTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryClientImplTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryClientImplTest.java index 56043c49ea..39739a2171 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryClientImplTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryClientImplTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryExponentialRetryTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryExponentialRetryTest.java index 77326d469d..182c658aaf 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryExponentialRetryTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryExponentialRetryTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryFacadeTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryFacadeTest.java index fb486427a5..8bc5a15ca5 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryFacadeTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/aaswrapper/registry/domain/DigitalTwinRegistryFacadeTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/bpdm/BpdmClientImplTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/bpdm/BpdmClientImplTest.java index 689d50fb3b..fcf8c1f8bb 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/bpdm/BpdmClientImplTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/bpdm/BpdmClientImplTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/bpdm/BpdmFacadeTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/bpdm/BpdmFacadeTest.java index e2cb9c362a..dad3b09408 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/bpdm/BpdmFacadeTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/bpdm/BpdmFacadeTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/component/tombstone/TombStoneTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/component/tombstone/TombStoneTest.java index e27c5eea15..b2090cae20 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/component/tombstone/TombStoneTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/component/tombstone/TombStoneTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicatorTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicatorTest.java index cff6f20fba..b06e8801b4 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicatorTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/MinioHealthIndicatorTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilterTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilterTest.java index f131b0ff57..6c57531462 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilterTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedEndpointsFilterTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedPortConfigurationTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedPortConfigurationTest.java index 821d472752..67a5c7368b 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedPortConfigurationTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/configuration/TrustedPortConfigurationTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/InMemoryJobStoreTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/InMemoryJobStoreTest.java index 648e4d9df2..23e7514fe8 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/InMemoryJobStoreTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/InMemoryJobStoreTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/JobOrchestratorTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/JobOrchestratorTest.java index 4d78f00a65..9e35f104b7 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/JobOrchestratorTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/JobOrchestratorTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/MultiTransferJobTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/MultiTransferJobTest.java index da33722833..d01b96c0b6 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/MultiTransferJobTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/MultiTransferJobTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStoreTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStoreTest.java index 708acfa764..b5eeb193eb 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStoreTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/connector/job/PersistentJobStoreTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsControllerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsControllerTest.java index ba20ccaa7b..b547f2f0af 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsControllerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsControllerTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsExceptionHandlerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsExceptionHandlerTest.java index 6bccf7bbcd..72903779e9 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsExceptionHandlerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/controllers/IrsExceptionHandlerTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/dto/assetadministrationshell/AssetAdministrationShellDescriptorTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/dto/assetadministrationshell/AssetAdministrationShellDescriptorTest.java index 4b735531eb..00e36d9f5b 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/dto/assetadministrationshell/AssetAdministrationShellDescriptorTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/dto/assetadministrationshell/AssetAdministrationShellDescriptorTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/ContractNegotiationServiceTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/ContractNegotiationServiceTest.java index a88035d3d0..7441d981f7 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/ContractNegotiationServiceTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/ContractNegotiationServiceTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/CxTestDataAnalyzerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/CxTestDataAnalyzerTest.java index 0add0d6c94..7e3587dae8 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/CxTestDataAnalyzerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/CxTestDataAnalyzerTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcCallbackControllerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcCallbackControllerTest.java index 778e9181f7..0b419befe2 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcCallbackControllerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcCallbackControllerTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcControlPlaneClientTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcControlPlaneClientTest.java index 33d6eda393..c111ab137c 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcControlPlaneClientTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcControlPlaneClientTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcDataPlaneClientTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcDataPlaneClientTest.java index 40bb514f9e..137a93b1dc 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcDataPlaneClientTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcDataPlaneClientTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java index 397a3dc5a7..43add88420 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelClientTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelFacadeTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelFacadeTest.java index 4e015987d9..8d4b25da3e 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelFacadeTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/EdcSubmodelFacadeTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/RelationshipAspectTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/RelationshipAspectTest.java index 6cb8f16d27..7a3a3f13a7 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/RelationshipAspectTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/RelationshipAspectTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelFacadeWiremockTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelFacadeWiremockTest.java index 9d5ef16929..2fed54f49e 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelFacadeWiremockTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelFacadeWiremockTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelRetryerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelRetryerTest.java index 6111854447..dd63dbcbdb 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelRetryerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelRetryerTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelTestdataCreatorTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelTestdataCreatorTest.java index eb875b2be8..b64f7cdc69 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelTestdataCreatorTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/edc/SubmodelTestdataCreatorTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/persistence/MinioBlobPersistenceTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/persistence/MinioBlobPersistenceTest.java index 2695b5a5dc..d09f234605 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/persistence/MinioBlobPersistenceTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/persistence/MinioBlobPersistenceTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticHubCacheInitializerTests.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticHubCacheInitializerTests.java index 67d6bbf470..10e9f64526 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticHubCacheInitializerTests.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticHubCacheInitializerTests.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticHubWiremockTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticHubWiremockTest.java index e677fc3e79..5455655682 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticHubWiremockTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticHubWiremockTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubClientImplTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubClientImplTest.java index aada17b4e4..9ae1ff5926 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubClientImplTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubClientImplTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubFacadeTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubFacadeTest.java index 9db6df18f1..6c1b27ba85 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubFacadeTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/semanticshub/SemanticsHubFacadeTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryServiceSpringBootTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryServiceSpringBootTest.java index 6aee4fbec1..fb0e800494 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryServiceSpringBootTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryServiceSpringBootTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryServiceTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryServiceTest.java index c9c402a69b..7d07e3dee0 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryServiceTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/IrsItemGraphQueryServiceTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/MeterRegistryServiceTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/MeterRegistryServiceTest.java index edab09a90b..1b6c1e3e1c 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/MeterRegistryServiceTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/MeterRegistryServiceTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryServiceTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryServiceTest.java index 0f62472195..610ed2ed26 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryServiceTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/OutboundMeterRegistryServiceTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/SecurityHelperServiceTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/SecurityHelperServiceTest.java index 7b95fb2cde..04621a55e7 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/SecurityHelperServiceTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/SecurityHelperServiceTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/validation/JsonValidatorServiceTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/validation/JsonValidatorServiceTest.java index c948a56bd2..3c86c602d1 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/services/validation/JsonValidatorServiceTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/services/validation/JsonValidatorServiceTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/util/JobResponseAnalyzerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/util/JobResponseAnalyzerTest.java index b7c8a078d1..9b8e7b4d42 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/util/JobResponseAnalyzerTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/util/JobResponseAnalyzerTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/util/JsonUtilTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/util/JsonUtilTest.java index db4907f258..a9f83a3a64 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/util/JsonUtilTest.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/util/JsonUtilTest.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/util/TestMother.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/util/TestMother.java index bf4e720322..f56eba07d9 100644 --- a/irs-api/src/test/java/org/eclipse/tractusx/irs/util/TestMother.java +++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/util/TestMother.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/AsyncFetchedItems.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/AsyncFetchedItems.java index ef18ef0a04..4a0810ab27 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/AsyncFetchedItems.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/AsyncFetchedItems.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Bpn.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Bpn.java index 2f66a75cd0..c4ef040d3a 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Bpn.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Bpn.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Description.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Description.java index c9c1630852..30a2686549 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Description.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Description.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Endpoint.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Endpoint.java index a9f8efb136..d6072301e9 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Endpoint.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Endpoint.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java index 3a475de640..a9ef401567 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/FetchedItems.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GenericDescription.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GenericDescription.java index 2b052b5290..a9217d809f 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GenericDescription.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GenericDescription.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GlobalAssetIdentification.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GlobalAssetIdentification.java index 7283f78aa7..aecac73aca 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GlobalAssetIdentification.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GlobalAssetIdentification.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/IStatusCodeEnum.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/IStatusCodeEnum.java index 86e0d89557..01b975332e 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/IStatusCodeEnum.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/IStatusCodeEnum.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Job.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Job.java index c218a2d975..005172a4f5 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Job.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Job.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobErrorDetails.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobErrorDetails.java index 0b8e903c5e..efe3440114 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobErrorDetails.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobErrorDetails.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobHandle.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobHandle.java index 464ac03d43..a5d8743a38 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobHandle.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobHandle.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobParameter.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobParameter.java index 0cfc664ae2..adf81bf336 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobParameter.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobParameter.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobStatusResult.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobStatusResult.java index 70a8126aea..d1107b72ee 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobStatusResult.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/JobStatusResult.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Jobs.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Jobs.java index 124e4594ec..80b7296269 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Jobs.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Jobs.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/LinkedItem.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/LinkedItem.java index 9e47ece1d1..abeeadb60e 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/LinkedItem.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/LinkedItem.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/MeasurementUnit.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/MeasurementUnit.java index 14265635da..28ecb16276 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/MeasurementUnit.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/MeasurementUnit.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/PageResult.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/PageResult.java index e328a82616..828ba7b3ee 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/PageResult.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/PageResult.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProcessingError.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProcessingError.java index 7a71bb1c7a..1f89aa33d1 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProcessingError.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProcessingError.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProtocolInformation.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProtocolInformation.java index fcda7193a2..255d0b0989 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProtocolInformation.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/ProtocolInformation.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Quantity.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Quantity.java index 7f6159f622..b782253132 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Quantity.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Quantity.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/RegisterJob.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/RegisterJob.java index fd66388324..06e8bfccf9 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/RegisterJob.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/RegisterJob.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java index 87687127bb..6efb568ded 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/SemanticId.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/SemanticId.java index 3be62c7711..d3069cd6fc 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/SemanticId.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/SemanticId.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Shell.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Shell.java index 71c6e92a55..3bc47dac5c 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Shell.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Shell.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Submodel.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Submodel.java index f240552166..c2049ba4a4 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Submodel.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Submodel.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/SubmodelDescriptor.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/SubmodelDescriptor.java index 9c6bc53a0d..252e4a6d55 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/SubmodelDescriptor.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/SubmodelDescriptor.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Summary.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Summary.java index 0744d856c0..b1b2ee4579 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Summary.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Summary.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Tombstone.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Tombstone.java index 36b0aa08e2..f55e3b4289 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Tombstone.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Tombstone.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AdministrativeInformation.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AdministrativeInformation.java index 32be01395e..01e910eb37 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AdministrativeInformation.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AdministrativeInformation.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java index 283f50dd4f..bd61803af2 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/AssetAdministrationShellDescriptor.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/Endpoint.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/Endpoint.java index e10bc2085c..f96b82cbef 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/Endpoint.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/Endpoint.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java index ce685e6c49..0572f15795 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/IdentifierKeyValuePair.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/LangString.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/LangString.java index b6b4396a3f..09be967972 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/LangString.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/LangString.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/ProtocolInformation.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/ProtocolInformation.java index 18f406a85e..f47c2dbdd2 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/ProtocolInformation.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/ProtocolInformation.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/Reference.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/Reference.java index 061b0752dc..d1b6414cd8 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/Reference.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/Reference.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/SubmodelDescriptor.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/SubmodelDescriptor.java index 5a52120b41..d89d8317bb 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/SubmodelDescriptor.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/assetadministrationshell/SubmodelDescriptor.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/AspectType.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/AspectType.java index 182ad899ba..618d82735b 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/AspectType.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/AspectType.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/BomLifecycle.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/BomLifecycle.java index 17c9a0e08a..3285fd0ebb 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/BomLifecycle.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/BomLifecycle.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/Direction.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/Direction.java index e931093581..733c7131d8 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/Direction.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/Direction.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/JobState.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/JobState.java index a71385686e..ca2ec18332 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/JobState.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/JobState.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/NodeType.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/NodeType.java index 6d26c89c42..aecd072bdc 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/NodeType.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/NodeType.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/ProcessStep.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/ProcessStep.java index 570eeb1e90..2f856a9845 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/ProcessStep.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/ProcessStep.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/StatusCodeEnum.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/StatusCodeEnum.java index 0f7e79fbe9..9dbcde4601 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/StatusCodeEnum.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/enums/StatusCodeEnum.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java index c24c9d2b92..2883a91855 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/irs-testing/src/main/java/org/eclipse/tractusx/irs/testing/containers/MinioContainer.java b/irs-testing/src/main/java/org/eclipse/tractusx/irs/testing/containers/MinioContainer.java index 1bea6eae52..bcd56ab8ef 100644 --- a/irs-testing/src/main/java/org/eclipse/tractusx/irs/testing/containers/MinioContainer.java +++ b/irs-testing/src/main/java/org/eclipse/tractusx/irs/testing/containers/MinioContainer.java @@ -1,9 +1,10 @@ /******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2021,2022,2023 * 2022: ZF Friedrichshafen AG * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation + * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * 2022,2023: BOSCH AG + * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. From bbbb9fa4d4f506387de8c8fd31db7de52ef9772e Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Mon, 27 Feb 2023 16:01:53 +0100 Subject: [PATCH 07/44] fix(workflow):[-] Fix indentation in workflow --- .github/workflows/helm-test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml index f60e97e027..7c2b694989 100644 --- a/.github/workflows/helm-test.yaml +++ b/.github/workflows/helm-test.yaml @@ -13,7 +13,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - fetch-depth: 0 + fetch-depth: 0 - name: Kubernetes KinD Cluster uses: container-tools/kind-action@v1 @@ -45,6 +45,7 @@ jobs: if [[ -n "$changed" ]]; then echo "::set-output name=changed::true" fi + - name: Run chart-testing (lint) run: ct lint --validate-maintainers=false --target-branch ${{ github.event.repository.default_branch }} From 9b8966f37a516d4fa44b2078bd239bbbbad501ab Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Mon, 27 Feb 2023 17:18:55 +0100 Subject: [PATCH 08/44] chore(release):[-] Prepare new helm release --- charts/irs/CHANGELOG.md | 14 +++++++++++++- charts/irs/Chart.yaml | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/irs/CHANGELOG.md b/charts/irs/CHANGELOG.md index f448b5a2ae..390ecea32a 100644 --- a/charts/irs/CHANGELOG.md +++ b/charts/irs/CHANGELOG.md @@ -5,10 +5,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [5.0.2] - 2023-02-27 +### Changed +- Updated default values so that IRS can start out of the box without technical errors. Please note that custom configuration is still necessary for IRS to work properly. + + +## [5.0.1] - 2023-02-21 +### Changed +- Fixed semantic hub placeholder in default values + + +## [5.0.0] - 2023-02-21 ### Changed - Changed config parameter ``semanticsHub`` to ``semanticshub`` - Moved path ``/models/`` from ``semanticshub.modelJsonSchemaEndpoint`` to ``semanticshub.url`` -- Updated default values so that IRS can start out of the box without technical errors. Please note that custom configuration is still necessary for IRS to work properly. + ### Migration note Please make sure that you update your URL config for the semantics hub (see "Changed" section). Otherwise, IRS can not pick up the config correctly. Your new URL needs to contain the /model path. diff --git a/charts/irs/Chart.yaml b/charts/irs/Chart.yaml index 9196b7396e..11d7273a81 100644 --- a/charts/irs/Chart.yaml +++ b/charts/irs/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 5.0.1 +version: 5.0.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 74d110b98205dcf877831db8b590ab4b5cb7c829 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 28 Feb 2023 08:58:31 +0100 Subject: [PATCH 09/44] chore(release):[-] Remove unwanted spaces --- charts/irs/templates/configmap-spring-app-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/irs/templates/configmap-spring-app-config.yaml b/charts/irs/templates/configmap-spring-app-config.yaml index 11e801035a..4509786407 100644 --- a/charts/irs/templates/configmap-spring-app-config.yaml +++ b/charts/irs/templates/configmap-spring-app-config.yaml @@ -35,18 +35,18 @@ data: digitalTwinRegistry: descriptorEndpoint: {{ tpl (.Values.digitalTwinRegistry.descriptorEndpoint | default "") . | quote }} - shellLookupEndpoint: {{ tpl (.Values.digitalTwinRegistry.shellLookupEndpoint | default "") . | quote }} + shellLookupEndpoint: {{ tpl (.Values.digitalTwinRegistry.shellLookupEndpoint | default "") . | quote }} semanticshub: - url: {{ tpl (.Values.semanticshub.url | default "") . | quote }} - modelJsonSchemaEndpoint: {{ tpl (.Values.semanticshub.modelJsonSchemaEndpoint | default "") . | quote }} + url: {{ tpl (.Values.semanticshub.url | default "") . | quote }} + modelJsonSchemaEndpoint: {{ tpl (.Values.semanticshub.modelJsonSchemaEndpoint | default "") . | quote }} defaultUrns: {{ tpl (.Values.semanticshub.defaultUrns | default "") . | quote }} {{- if .Values.semanticshub.localModels }} localModelDirectory: /app/semantic-models {{- end }} bpdm: - bpnEndpoint: {{ tpl (.Values.bpdm.bpnEndpoint | default "") . | quote }} + bpnEndpoint: {{ tpl (.Values.bpdm.bpnEndpoint | default "") . | quote }} edc: controlplane: From da23b346e67ad3d5501c6744270ce4e20e496c56 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Tue, 28 Feb 2023 09:34:40 +0100 Subject: [PATCH 10/44] feat(charts):[TRI-1114] Downgrade EDC to 0.1.6 --- charts/edc-consumer/CHANGELOG.md | 7 +++++++ charts/edc-consumer/Chart.yaml | 4 ++-- charts/edc-consumer/charts/edc-controlplane/Chart.yaml | 2 +- .../charts/edc-controlplane/templates/configmap.yaml | 2 +- charts/edc-consumer/charts/edc-dataplane/Chart.yaml | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/charts/edc-consumer/CHANGELOG.md b/charts/edc-consumer/CHANGELOG.md index b3bcc47f53..ca889f808f 100644 --- a/charts/edc-consumer/CHANGELOG.md +++ b/charts/edc-consumer/CHANGELOG.md @@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- Downgrade EDC to 0.1.6 +- Renamed controlplane property `edc.oauth.endpoint.audience` to `edc.ids.endpoint.audience` + +## [1.0.3] - 2023-02-21 +### Changed +- Updated default memory requests ## [1.0.2] - 2022-12-19 ### Changed diff --git a/charts/edc-consumer/Chart.yaml b/charts/edc-consumer/Chart.yaml index 54cabe77d5..738f799117 100644 --- a/charts/edc-consumer/Chart.yaml +++ b/charts/edc-consumer/Chart.yaml @@ -14,13 +14,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.3 +version: 1.0.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.2.0" +appVersion: "0.1.6" dependencies: - name: common diff --git a/charts/edc-consumer/charts/edc-controlplane/Chart.yaml b/charts/edc-consumer/charts/edc-controlplane/Chart.yaml index d5ea0fd459..bcf934b459 100644 --- a/charts/edc-consumer/charts/edc-controlplane/Chart.yaml +++ b/charts/edc-consumer/charts/edc-controlplane/Chart.yaml @@ -4,6 +4,6 @@ name: edc-controlplane description: EDC Control-Plane home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-controlplane type: application -appVersion: "0.2.0" +appVersion: 0.1.6 version: 0.2.0 maintainers: [] \ No newline at end of file diff --git a/charts/edc-consumer/charts/edc-controlplane/templates/configmap.yaml b/charts/edc-consumer/charts/edc-controlplane/templates/configmap.yaml index b61c2eae07..a011da7673 100644 --- a/charts/edc-consumer/charts/edc-controlplane/templates/configmap.yaml +++ b/charts/edc-consumer/charts/edc-controlplane/templates/configmap.yaml @@ -23,7 +23,7 @@ data: edc.ids.id=urn:connector:edc-consumer-controlplane edc.ids.catalog.id=urn:catalog:default edc.ids.endpoint={{ .Values.edc.controlplane.url }}/api/v1/ids - edc.oauth.endpoint.audience={{ .Values.edc.controlplane.url }}/api/v1/ids/data + edc.ids.endpoint.audience={{ .Values.edc.controlplane.url }}/api/v1/ids/data edc.receiver.http.endpoint={{ tpl .Values.edc.receiver.callback.url . }} edc.transfer.dataplane.sync.endpoint=http://{{ .Release.Name }}-edc-dataplane:8185/api/public edc.transfer.proxy.endpoint={{ .Values.edc.dataplane.url }}/api/public diff --git a/charts/edc-consumer/charts/edc-dataplane/Chart.yaml b/charts/edc-consumer/charts/edc-dataplane/Chart.yaml index f545be48f5..ad4fc34d7d 100644 --- a/charts/edc-consumer/charts/edc-dataplane/Chart.yaml +++ b/charts/edc-consumer/charts/edc-dataplane/Chart.yaml @@ -5,6 +5,6 @@ description: >- EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-dataplane type: application -appVersion: "0.2.0" +appVersion: 0.1.6 version: 0.2.0 maintainers: [] \ No newline at end of file From 1768a7711ba185d4df59403aa521f1ed65bfa383 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 28 Feb 2023 09:40:22 +0100 Subject: [PATCH 11/44] chore(release):[-] Update README --- README.md | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1637155df0..66f7ab4906 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,6 @@ The following subsection provides instructions for running the infrastructure on - Start the application from your favorite IDE. For IntelliJ, a run configuration is available in the .run folder. -- **Hint** - Docker Image and Docker Compose that exist in root directory of application is only for local deployment. - It is not and should be not use in any test or production deployment. - #### Local IRS API - Swagger UI: http://localhost:8080/api/swagger-ui @@ -125,3 +121,19 @@ curl -X 'GET' 'http://localhost:8080/irs/jobs/' -H 'accept: application/j ## Licenses Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) - see [LICENSE](./LICENSE) + +## Notice for Docker image +This application provides container images for demonstration purposes. + +DockerHub: https://hub.docker.com/r/tractusx/irs-api + +Eclipse Tractus-X product(s) installed within the image: + +GitHub: https://github.com/eclipse-tractusx/item-relationship-service +Project home: https://projects.eclipse.org/projects/automotive.tractusx +License: Apache License, Version 2.0 +Used base image: eclipse-temurin:19-jre-alpine + +As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained). + +As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within. \ No newline at end of file From a7d517ef455108513fe7e8ebd36726cb9f4b0eee Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 28 Feb 2023 09:48:43 +0100 Subject: [PATCH 12/44] chore(release):[-] Fix linting issue --- charts/irs/Chart.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/irs/Chart.yaml b/charts/irs/Chart.yaml index 11d7273a81..0ebbb845bb 100644 --- a/charts/irs/Chart.yaml +++ b/charts/irs/Chart.yaml @@ -38,4 +38,3 @@ dependencies: repository: https://grafana.github.io/helm-charts version: 6.44.8 condition: grafana.enabled - From 9c918382f2cab950e3ffa94651969db6461f91eb Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 28 Feb 2023 10:05:35 +0100 Subject: [PATCH 13/44] chore(release):[-] Fix linting issue --- .github/workflows/helm-test.yaml | 2 +- charts/irs/values.yaml | 62 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml index 7c2b694989..45e375d54c 100644 --- a/.github/workflows/helm-test.yaml +++ b/.github/workflows/helm-test.yaml @@ -23,7 +23,7 @@ jobs: with: context: . push: true - tags: kind-registry:5000/app-dashboard:testing + tags: kind-registry:5000/irs-api:testing - name: Set up Helm uses: azure/setup-helm@v3 diff --git a/charts/irs/values.yaml b/charts/irs/values.yaml index 63cc96a7ec..7f87992d02 100644 --- a/charts/irs/values.yaml +++ b/charts/irs/values.yaml @@ -8,9 +8,9 @@ image: repository: ghcr.io/catenax-ng/irs-api pullPolicy: Always -imagePullSecrets: [ ] +imagePullSecrets: [] -podAnnotations: { } +podAnnotations: {} # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment podSecurityContext: @@ -48,9 +48,9 @@ resources: cpu: 250m memory: 1.5Gi -nodeSelector: { } +nodeSelector: {} -tolerations: [ ] +tolerations: [] # Following Catena-X Helm Best Practices @url: https://catenax-ng.github.io/docs/kubernetes-basics/helm # @url: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -83,59 +83,59 @@ readinessProbe: ##################### # IRS Configuration # ##################### -irsUrl: # "https://" +irsUrl: # "https://" ingress: enabled: false digitalTwinRegistry: - url: # "https://" + url: # "https://" descriptorEndpoint: >- {{ tpl (.Values.digitalTwinRegistry.url | default "") . }}/registry/shell-descriptors/{aasIdentifier} shellLookupEndpoint: >- {{ tpl (.Values.digitalTwinRegistry.url | default "") . }}/lookup/shells?assetIds={assetIds} semanticshub: - url: # https:// + url: # https:// modelJsonSchemaEndpoint: >- {{ if .Values.semanticshub.url }} {{ tpl (.Values.semanticshub.url | default "" ) . }}/{urn}/json-schema {{ end }} defaultUrns: >- -# urn:bamm:io.catenax.serial_part_typization:1.0.0#SerialPartTypization -# ,urn:bamm:com.catenax.assembly_part_relationship:1.0.0#AssemblyPartRelationship + # urn:bamm:io.catenax.serial_part_typization:1.0.0#SerialPartTypization + # ,urn:bamm:com.catenax.assembly_part_relationship:1.0.0#AssemblyPartRelationship localModels: # Map of Base64 encoded strings of semantic models. The key must be the Base64 encoded full URN of the model. # Example for urn:bamm:io.catenax.serial_part_typization:1.1.1#SerialPartTypization: # dXJuOmJhbW06aW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uOjEuMS4xI1NlcmlhbFBhcnRUeXBpemF0aW9u: ewoJIiRzY2hlbWEiOiAiaHR0cDovL2pzb24tc2NoZW1hLm9yZy9kcmFmdC0wNC9zY2hlbWEiLAoJInR5cGUiOiAib2JqZWN0IiwKCSJjb21wb25lbnRzIjogewoJCSJzY2hlbWFzIjogewoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0NhdGVuYVhJZFRyYWl0IjogewoJCQkJInR5cGUiOiAic3RyaW5nIiwKCQkJCSJwYXR0ZXJuIjogIiheWzAtOWEtZkEtRl17OH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17MTJ9JCl8KF51cm46dXVpZDpbMC05YS1mQS1GXXs4fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXsxMn0kKSIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9LZXlDaGFyYWN0ZXJpc3RpYyI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9WYWx1ZUNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAic3RyaW5nIgoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0tleVZhbHVlTGlzdCI6IHsKCQkJCSJ0eXBlIjogIm9iamVjdCIsCgkJCQkicHJvcGVydGllcyI6IHsKCQkJCQkia2V5IjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfS2V5Q2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkidmFsdWUiOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9WYWx1ZUNoYXJhY3RlcmlzdGljIgoJCQkJCX0KCQkJCX0sCgkJCQkicmVxdWlyZWQiOiBbCgkJCQkJImtleSIsCgkJCQkJInZhbHVlIgoJCQkJXQoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0xvY2FsSWRlbnRpZmllckNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAiYXJyYXkiLAoJCQkJIml0ZW1zIjogewoJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9LZXlWYWx1ZUxpc3QiCgkJCQl9LAoJCQkJInVuaXF1ZUl0ZW1zIjogdHJ1ZQoJCQl9LAoJCQkidXJuX2JhbW1faW8ub3Blbm1hbnVmYWN0dXJpbmdfY2hhcmFjdGVyaXN0aWNfMi4wLjBfVGltZXN0YW1wIjogewoJCQkJInR5cGUiOiAic3RyaW5nIiwKCQkJCSJwYXR0ZXJuIjogIi0/KFsxLTldWzAtOV17Myx9fDBbMC05XXszfSktKDBbMS05XXwxWzAtMl0pLSgwWzEtOV18WzEyXVswLTldfDNbMDFdKVQoKFswMV1bMC05XXwyWzAtM10pOlswLTVdWzAtOV06WzAtNV1bMC05XShcXC5bMC05XSspP3woMjQ6MDA6MDAoXFwuMCspPykpKFp8KFxcK3wtKSgoMFswLTldfDFbMC0zXSk6WzAtNV1bMC05XXwxNDowMCkpPyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9Qcm9kdWN0aW9uQ291bnRyeUNvZGVUcmFpdCI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIsCgkJCQkicGF0dGVybiI6ICJeW0EtWl1bQS1aXVtBLVpdJCIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9NYW51ZmFjdHVyaW5nQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJvYmplY3QiLAoJCQkJInByb3BlcnRpZXMiOiB7CgkJCQkJImRhdGUiOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLm9wZW5tYW51ZmFjdHVyaW5nX2NoYXJhY3RlcmlzdGljXzIuMC4wX1RpbWVzdGFtcCIKCQkJCQl9LAoJCQkJCSJjb3VudHJ5IjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUHJvZHVjdGlvbkNvdW50cnlDb2RlVHJhaXQiCgkJCQkJfQoJCQkJfSwKCQkJCSJyZXF1aXJlZCI6IFsKCQkJCQkiZGF0ZSIKCQkJCV0KCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0SWRDaGFyYWN0ZXJpc3RpYyI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0TmFtZUNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAic3RyaW5nIgoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0NsYXNzaWZpY2F0aW9uQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJzdHJpbmciLAoJCQkJImVudW0iOiBbCgkJCQkJInByb2R1Y3QiLAoJCQkJCSJyYXcgbWF0ZXJpYWwiLAoJCQkJCSJzb2Z0d2FyZSIsCgkJCQkJImFzc2VtYmx5IiwKCQkJCQkidG9vbCIsCgkJCQkJImNvbXBvbmVudCIKCQkJCV0KCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0VHlwZUluZm9ybWF0aW9uQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJvYmplY3QiLAoJCQkJInByb3BlcnRpZXMiOiB7CgkJCQkJIm1hbnVmYWN0dXJlclBhcnRJZCI6IHsKCQkJCQkJIiRyZWYiOiAiIy9jb21wb25lbnRzL3NjaGVtYXMvdXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX1BhcnRJZENoYXJhY3RlcmlzdGljIgoJCQkJCX0sCgkJCQkJImN1c3RvbWVyUGFydElkIjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUGFydElkQ2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkibmFtZUF0TWFudWZhY3R1cmVyIjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUGFydE5hbWVDaGFyYWN0ZXJpc3RpYyIKCQkJCQl9LAoJCQkJCSJuYW1lQXRDdXN0b21lciI6IHsKCQkJCQkJIiRyZWYiOiAiIy9jb21wb25lbnRzL3NjaGVtYXMvdXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX1BhcnROYW1lQ2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkiY2xhc3NpZmljYXRpb24iOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9DbGFzc2lmaWNhdGlvbkNoYXJhY3RlcmlzdGljIgoJCQkJCX0KCQkJCX0sCgkJCQkicmVxdWlyZWQiOiBbCgkJCQkJIm1hbnVmYWN0dXJlclBhcnRJZCIsCgkJCQkJIm5hbWVBdE1hbnVmYWN0dXJlciIsCgkJCQkJImNsYXNzaWZpY2F0aW9uIgoJCQkJXQoJCQl9CgkJfQoJfSwKCSJwcm9wZXJ0aWVzIjogewoJCSJjYXRlbmFYSWQiOiB7CgkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9DYXRlbmFYSWRUcmFpdCIKCQl9LAoJCSJsb2NhbElkZW50aWZpZXJzIjogewoJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfTG9jYWxJZGVudGlmaWVyQ2hhcmFjdGVyaXN0aWMiCgkJfSwKCQkibWFudWZhY3R1cmluZ0luZm9ybWF0aW9uIjogewoJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfTWFudWZhY3R1cmluZ0NoYXJhY3RlcmlzdGljIgoJCX0sCgkJInBhcnRUeXBlSW5mb3JtYXRpb24iOiB7CgkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0VHlwZUluZm9ybWF0aW9uQ2hhcmFjdGVyaXN0aWMiCgkJfQoJfSwKCSJyZXF1aXJlZCI6IFsKCQkiY2F0ZW5hWElkIiwKCQkibG9jYWxJZGVudGlmaWVycyIsCgkJIm1hbnVmYWN0dXJpbmdJbmZvcm1hdGlvbiIsCgkJInBhcnRUeXBlSW5mb3JtYXRpb24iCgldCn0= bpdm: - url: # https:// + url: # https:// bpnEndpoint: > {{ tpl (.Values.bpdm.url | default "") . }}/api/catena/legal-entities/{partnerId}?idType={idType} -minioUser: "minio" # -minioPassword: "minioPass" # +minioUser: "minio" # +minioPassword: "minioPass" # minioUrl: "http://{{ .Release.Name }}-minio:9000" keycloak: oauth2: - clientId: # - clientSecret: # - clientTokenUri: # - jwkSetUri: # + clientId: # + clientSecret: # + clientTokenUri: # + jwkSetUri: # edc: controlplane: endpoint: - data: "" # + data: "" # request: - ttl: PT10M # Requests to controlplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) + ttl: PT10M # Requests to controlplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) provider: suffix: /api/v1/ids/data catalog: - limit: 1000 # Max number of catalog items to retrieve from the controlplane - pagesize: 50 # Number of catalog items to retrieve on one page for pagination + limit: 1000 # Max number of catalog items to retrieve from the controlplane + pagesize: 50 # Number of catalog items to retrieve on one page for pagination apikey: - header: "X-Api-Key" # Name of the EDC api key header field - secret: "" # + header: "X-Api-Key" # Name of the EDC api key header field + secret: "" # submodel: request: - ttl: PT10M # Requests to dataplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) + ttl: PT10M # Requests to dataplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) path: /submodel urnprefix: /urn @@ -148,7 +148,7 @@ config: content: -env: [] # You can provide your own environment variables for the IRS here. +env: [] # You can provide your own environment variables for the IRS here. # - name: JAVA_TOOL_OPTIONS # value: -Dhttps.proxyHost=1.2.3.4 @@ -164,8 +164,8 @@ minio: resources: requests: memory: 4Gi - rootUser: "minio" # - rootPassword: "minioPass" # + rootUser: "minio" # + rootPassword: "minioPass" # environment: MINIO_PROMETHEUS_JOB_ID: minio-actuator @@ -176,7 +176,7 @@ minio: # Prometheus Configuration # ############################ prometheus: - enabled: false #<1> + enabled: false #<1> rbac: create: false alertmanager: @@ -208,14 +208,14 @@ prometheus: # Grafana Configuration # ######################### grafana: - enabled: false #<1> + enabled: false #<1> rbac: create: false persistence: enabled: false - user: # - password: # + user: # + password: # admin: existingSecret: "{{ .Release.Name }}-irs-helm" @@ -6772,4 +6772,4 @@ grafana: "uid": "XuMrTRR4z", "version": 5, "weekStart": "" - } \ No newline at end of file + } From 94ccc38bdd5ed1cd0224200780c20cab31ec2e56 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Tue, 28 Feb 2023 10:17:22 +0100 Subject: [PATCH 14/44] feat(charts):[TRI-1114] Fix linting issue --- charts/edc-consumer/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/edc-consumer/values.yaml b/charts/edc-consumer/values.yaml index 70f5cdae03..57b1ac5c07 100644 --- a/charts/edc-consumer/values.yaml +++ b/charts/edc-consumer/values.yaml @@ -34,7 +34,7 @@ edc-controlplane: edc: receiver: callback: - url: "http://{{ .Release.Name }}-irs-helm:8181/internal/endpoint-data-reference" # IRS EDC callback URL, e.g. http://app-irs-helm:8181/internal/endpoint-data-reference + url: "http://{{ .Release.Name }}-irs-helm:8181/internal/endpoint-data-reference" # IRS EDC callback URL, e.g. http://app-irs-helm:8181/internal/endpoint-data-reference postgresql: user: edc password: From 560fb37c75e39999d9c253378bf811092f7f461b Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 28 Feb 2023 10:20:15 +0100 Subject: [PATCH 15/44] chore(release):[-] Fix linting issue --- charts/irs/values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/irs/values.yaml b/charts/irs/values.yaml index 7f87992d02..eac7a956fc 100644 --- a/charts/irs/values.yaml +++ b/charts/irs/values.yaml @@ -96,9 +96,9 @@ digitalTwinRegistry: semanticshub: url: # https:// modelJsonSchemaEndpoint: >- - {{ if .Values.semanticshub.url }} - {{ tpl (.Values.semanticshub.url | default "" ) . }}/{urn}/json-schema - {{ end }} + {{- if .Values.semanticshub.url }} + {{- tpl (.Values.semanticshub.url | default "" ) . }}/{urn}/json-schema + {{- end }} defaultUrns: >- # urn:bamm:io.catenax.serial_part_typization:1.0.0#SerialPartTypization # ,urn:bamm:com.catenax.assembly_part_relationship:1.0.0#AssemblyPartRelationship @@ -122,7 +122,7 @@ keycloak: edc: controlplane: endpoint: - data: "" # + data: "" # request: ttl: PT10M # Requests to controlplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) provider: @@ -176,7 +176,7 @@ minio: # Prometheus Configuration # ############################ prometheus: - enabled: false #<1> + enabled: false # <1> rbac: create: false alertmanager: @@ -208,7 +208,7 @@ prometheus: # Grafana Configuration # ######################### grafana: - enabled: false #<1> + enabled: false # <1> rbac: create: false persistence: From 27e0c130767229159bced7063ade26bd17dbd937 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 28 Feb 2023 10:26:40 +0100 Subject: [PATCH 16/44] chore(release):[-] Add missing Helm repos --- .github/workflows/helm-test.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml index 45e375d54c..8040a629cd 100644 --- a/.github/workflows/helm-test.yaml +++ b/.github/workflows/helm-test.yaml @@ -50,5 +50,11 @@ jobs: run: ct lint --validate-maintainers=false --target-branch ${{ github.event.repository.default_branch }} - name: Run chart-testing (install) - run: ct install --charts charts/irs + run: | + helm repo add bitnami https://charts.bitnami.com/bitnami + helm repo add minio https://charts.min.io/ + helm repo add prometheus-community https://prometheus-community.github.io/helm-charts + helm repo add grafana https://grafana.github.io/helm-charts + helm dependency update + ct install --charts charts/irs if: steps.list-changed.outputs.changed == 'true' \ No newline at end of file From d25878278af7493ebe019b2fa08a7c74177b48a0 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 28 Feb 2023 10:32:35 +0100 Subject: [PATCH 17/44] chore(release):[-] Remove Helm step --- .github/workflows/helm-test.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml index 8040a629cd..c505273358 100644 --- a/.github/workflows/helm-test.yaml +++ b/.github/workflows/helm-test.yaml @@ -55,6 +55,5 @@ jobs: helm repo add minio https://charts.min.io/ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts helm repo add grafana https://grafana.github.io/helm-charts - helm dependency update - ct install --charts charts/irs + ct install --charts charts/irs --config charts/chart-testing-config-helm-environments.yaml if: steps.list-changed.outputs.changed == 'true' \ No newline at end of file From dc02fabb02ae3dc6486613aed8a8a8a58fc9a29e Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 28 Feb 2023 10:38:05 +0100 Subject: [PATCH 18/44] chore(release):[-] Fix config --- .github/workflows/helm-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml index c505273358..9580e2064e 100644 --- a/.github/workflows/helm-test.yaml +++ b/.github/workflows/helm-test.yaml @@ -55,5 +55,5 @@ jobs: helm repo add minio https://charts.min.io/ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts helm repo add grafana https://grafana.github.io/helm-charts - ct install --charts charts/irs --config charts/chart-testing-config-helm-environments.yaml + ct install --charts charts/irs if: steps.list-changed.outputs.changed == 'true' \ No newline at end of file From 8cdfb3c9eeb854783f3a0186558507ec8d55f8ad Mon Sep 17 00:00:00 2001 From: mk Date: Tue, 28 Feb 2023 17:50:04 +0100 Subject: [PATCH 19/44] doc(uml):[TRI-967] add submodel component --- .../submodelserver-sequence.puml | 11 ++++ .../supply-chain-component.puml | 58 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 uml-diagrams/irs-supply-chain-act/submodelserver-sequence.puml create mode 100644 uml-diagrams/irs-supply-chain-act/supply-chain-component.puml diff --git a/uml-diagrams/irs-supply-chain-act/submodelserver-sequence.puml b/uml-diagrams/irs-supply-chain-act/submodelserver-sequence.puml new file mode 100644 index 0000000000..ac2c2d3913 --- /dev/null +++ b/uml-diagrams/irs-supply-chain-act/submodelserver-sequence.puml @@ -0,0 +1,11 @@ +@startuml +'https://plantuml.com/sequence-diagram + +autonumber + +Alice -> Bob: Authentication Request +Bob --> Alice: Authentication Response + +Alice -> Bob: Another authentication Request +Alice <-- Bob: another authentication Response +@enduml \ No newline at end of file diff --git a/uml-diagrams/irs-supply-chain-act/supply-chain-component.puml b/uml-diagrams/irs-supply-chain-act/supply-chain-component.puml new file mode 100644 index 0000000000..55092a9c6e --- /dev/null +++ b/uml-diagrams/irs-supply-chain-act/supply-chain-component.puml @@ -0,0 +1,58 @@ +@startuml + +skinparam monochrome true +skinparam shadowing false + +actor user + +package "OEM" { + + + interface "IRS API" as IRSAPI_OEM + component "[**IRS**]" as IRS_OEM + component "[**Notification**]" as Notification_OEM + +} + + + + component "EDC Consumer" as EDC_Consumer + component "EDC Provider" as EDC_Provider + +package "Tier 1" { + + component "ESSIncident SubmodelServer" as SubmodelServer + interface "IRS API" as IRSAPI_TIER + component "[**IRS**]" as IRS_TIER +} + + +package "Shared Services" { + + component "DTwin Registry" as DTwin_Registry + component "SPT & APR providing SubmodelServer" as Part_SubmodelServer + component "Discovery Service" as Service_Discovery +} + + +IRS_OEM <---> DTwin_Registry : lookup AAS +IRS_OEM <---> Part_SubmodelServer : lookup SPT +IRS_OEM <---> Service_Discovery : lookup EDC address by BPNL +user -> IRSAPI_OEM +IRSAPI_OEM - IRS_OEM +IRS_OEM <-> Notification_OEM +EDC_Consumer <-> EDC_Provider: 1: negotation +EDC_Provider -> SubmodelServer : 1: send notification +SubmodelServer -> EDC_Provider : 2: send ack 201 +EDC_Consumer <-> EDC_Provider: 2: forward ack 201 +EDC_Consumer <-> EDC_Provider: 2: negotation +Notification_OEM -> EDC_Consumer : 1: send notification +Notification_OEM <- EDC_Consumer : 2: ack 201 +Notification_OEM <- EDC_Consumer : 3: invoke callback +SubmodelServer -> IRSAPI_TIER : start BPNInvest +IRSAPI_TIER - IRS_TIER + +EDC_Provider <- SubmodelServer : 3: invoke callback method + + +@enduml \ No newline at end of file From 90d6dde5918cdccc5d222011a79c4a0a328cb921 Mon Sep 17 00:00:00 2001 From: mk Date: Tue, 28 Feb 2023 17:50:04 +0100 Subject: [PATCH 20/44] doc(uml):[TRI-967] add submodel component --- .../submodelserver-sequence.puml | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/uml-diagrams/irs-supply-chain-act/submodelserver-sequence.puml b/uml-diagrams/irs-supply-chain-act/submodelserver-sequence.puml index ac2c2d3913..b381ed4a2c 100644 --- a/uml-diagrams/irs-supply-chain-act/submodelserver-sequence.puml +++ b/uml-diagrams/irs-supply-chain-act/submodelserver-sequence.puml @@ -3,9 +3,32 @@ autonumber -Alice -> Bob: Authentication Request -Bob --> Alice: Authentication Response +EDC_P -> SubmodelServer: ESSIncident request +SubmodelServer -> SubmodelServer: receive ESSIncident request +EDC_P <- SubmodelServer : Send ack 201 +SubmodelServer -> SubmodelServer : analyse ESSIncident content +note left SubmodelServer + "incidentBpn" : "BPNS123456" + "concernedCatenaXIds" : ["CxUUID"] +end note +loop for each concernedCatenaXIds + SubmodelServer -> IRS : BPN Investigation (globalAssetId, bom, incidentBpns) + IRS -> IRS : register job + SubmodelServer <- IRS: 201 job id + IRS -> EDC_C : send ESSIncident notification request + IRS <-- EDC_C : receive ack 201 + hnote over IRS : wait (36000ms) + alt timeout exceeded + IRS <- IRS : set incident state = unknown + else + IRS <- EDC_C : receive notification callback + IRS <- IRS : set incident state + end + SubmodelServer <- IRS : BPN Investigation result + + SubmodelServer -> SubmodelServer : update incident state +end loop + EDC_P <- SubmodelServer: ess-suplier-response (incident state) + -Alice -> Bob: Another authentication Request -Alice <-- Bob: another authentication Response @enduml \ No newline at end of file From 746493ff0c72110dbc8415f6ce9cc48c0cf73cae Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Wed, 1 Mar 2023 10:12:35 +0100 Subject: [PATCH 21/44] feat(impl):[TRI-1069] run owaps and eclipse dash only when dependencies are changing --- .github/workflows/eclipse-dash.yml | 3 +++ .github/workflows/owasp.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/eclipse-dash.yml b/.github/workflows/eclipse-dash.yml index 89ff8abd3f..3faee35540 100644 --- a/.github/workflows/eclipse-dash.yml +++ b/.github/workflows/eclipse-dash.yml @@ -9,6 +9,9 @@ on: - '**/*.txt' pull_request: branches: main + paths: + - '**/pom.xml' + - 'pom.xml' paths-ignore: - '**/*.md' - '**/*.txt' diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml index 889eb24f1d..62511ea6b5 100644 --- a/.github/workflows/owasp.yml +++ b/.github/workflows/owasp.yml @@ -8,6 +8,9 @@ on: - '**/*.txt' pull_request: branches: main + paths: + - '**/pom.xml' + - 'pom.xml' paths-ignore: - '**/*.md' - '**/*.txt' From dcd16ab34ca8035878f8384f1873f74d147c073f Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Wed, 1 Mar 2023 10:14:51 +0100 Subject: [PATCH 22/44] chore(charts):[-] Fix bpnEndpoint template --- charts/irs/CHANGELOG.md | 5 +++++ charts/irs/Chart.yaml | 2 +- charts/irs/values.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/irs/CHANGELOG.md b/charts/irs/CHANGELOG.md index 390ecea32a..fe15f3c06b 100644 --- a/charts/irs/CHANGELOG.md +++ b/charts/irs/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.0.3] - 2023-03-01 +### Fixed +- Fixed helm template for bpnEndpoint + + ## [5.0.2] - 2023-02-27 ### Changed - Updated default values so that IRS can start out of the box without technical errors. Please note that custom configuration is still necessary for IRS to work properly. diff --git a/charts/irs/Chart.yaml b/charts/irs/Chart.yaml index 0ebbb845bb..e29597fc91 100644 --- a/charts/irs/Chart.yaml +++ b/charts/irs/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 5.0.2 +version: 5.0.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/irs/values.yaml b/charts/irs/values.yaml index eac7a956fc..fb5902fd61 100644 --- a/charts/irs/values.yaml +++ b/charts/irs/values.yaml @@ -108,7 +108,7 @@ semanticshub: # dXJuOmJhbW06aW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uOjEuMS4xI1NlcmlhbFBhcnRUeXBpemF0aW9u: ewoJIiRzY2hlbWEiOiAiaHR0cDovL2pzb24tc2NoZW1hLm9yZy9kcmFmdC0wNC9zY2hlbWEiLAoJInR5cGUiOiAib2JqZWN0IiwKCSJjb21wb25lbnRzIjogewoJCSJzY2hlbWFzIjogewoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0NhdGVuYVhJZFRyYWl0IjogewoJCQkJInR5cGUiOiAic3RyaW5nIiwKCQkJCSJwYXR0ZXJuIjogIiheWzAtOWEtZkEtRl17OH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17MTJ9JCl8KF51cm46dXVpZDpbMC05YS1mQS1GXXs4fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXsxMn0kKSIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9LZXlDaGFyYWN0ZXJpc3RpYyI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9WYWx1ZUNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAic3RyaW5nIgoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0tleVZhbHVlTGlzdCI6IHsKCQkJCSJ0eXBlIjogIm9iamVjdCIsCgkJCQkicHJvcGVydGllcyI6IHsKCQkJCQkia2V5IjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfS2V5Q2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkidmFsdWUiOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9WYWx1ZUNoYXJhY3RlcmlzdGljIgoJCQkJCX0KCQkJCX0sCgkJCQkicmVxdWlyZWQiOiBbCgkJCQkJImtleSIsCgkJCQkJInZhbHVlIgoJCQkJXQoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0xvY2FsSWRlbnRpZmllckNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAiYXJyYXkiLAoJCQkJIml0ZW1zIjogewoJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9LZXlWYWx1ZUxpc3QiCgkJCQl9LAoJCQkJInVuaXF1ZUl0ZW1zIjogdHJ1ZQoJCQl9LAoJCQkidXJuX2JhbW1faW8ub3Blbm1hbnVmYWN0dXJpbmdfY2hhcmFjdGVyaXN0aWNfMi4wLjBfVGltZXN0YW1wIjogewoJCQkJInR5cGUiOiAic3RyaW5nIiwKCQkJCSJwYXR0ZXJuIjogIi0/KFsxLTldWzAtOV17Myx9fDBbMC05XXszfSktKDBbMS05XXwxWzAtMl0pLSgwWzEtOV18WzEyXVswLTldfDNbMDFdKVQoKFswMV1bMC05XXwyWzAtM10pOlswLTVdWzAtOV06WzAtNV1bMC05XShcXC5bMC05XSspP3woMjQ6MDA6MDAoXFwuMCspPykpKFp8KFxcK3wtKSgoMFswLTldfDFbMC0zXSk6WzAtNV1bMC05XXwxNDowMCkpPyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9Qcm9kdWN0aW9uQ291bnRyeUNvZGVUcmFpdCI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIsCgkJCQkicGF0dGVybiI6ICJeW0EtWl1bQS1aXVtBLVpdJCIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9NYW51ZmFjdHVyaW5nQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJvYmplY3QiLAoJCQkJInByb3BlcnRpZXMiOiB7CgkJCQkJImRhdGUiOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLm9wZW5tYW51ZmFjdHVyaW5nX2NoYXJhY3RlcmlzdGljXzIuMC4wX1RpbWVzdGFtcCIKCQkJCQl9LAoJCQkJCSJjb3VudHJ5IjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUHJvZHVjdGlvbkNvdW50cnlDb2RlVHJhaXQiCgkJCQkJfQoJCQkJfSwKCQkJCSJyZXF1aXJlZCI6IFsKCQkJCQkiZGF0ZSIKCQkJCV0KCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0SWRDaGFyYWN0ZXJpc3RpYyI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0TmFtZUNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAic3RyaW5nIgoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0NsYXNzaWZpY2F0aW9uQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJzdHJpbmciLAoJCQkJImVudW0iOiBbCgkJCQkJInByb2R1Y3QiLAoJCQkJCSJyYXcgbWF0ZXJpYWwiLAoJCQkJCSJzb2Z0d2FyZSIsCgkJCQkJImFzc2VtYmx5IiwKCQkJCQkidG9vbCIsCgkJCQkJImNvbXBvbmVudCIKCQkJCV0KCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0VHlwZUluZm9ybWF0aW9uQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJvYmplY3QiLAoJCQkJInByb3BlcnRpZXMiOiB7CgkJCQkJIm1hbnVmYWN0dXJlclBhcnRJZCI6IHsKCQkJCQkJIiRyZWYiOiAiIy9jb21wb25lbnRzL3NjaGVtYXMvdXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX1BhcnRJZENoYXJhY3RlcmlzdGljIgoJCQkJCX0sCgkJCQkJImN1c3RvbWVyUGFydElkIjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUGFydElkQ2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkibmFtZUF0TWFudWZhY3R1cmVyIjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUGFydE5hbWVDaGFyYWN0ZXJpc3RpYyIKCQkJCQl9LAoJCQkJCSJuYW1lQXRDdXN0b21lciI6IHsKCQkJCQkJIiRyZWYiOiAiIy9jb21wb25lbnRzL3NjaGVtYXMvdXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX1BhcnROYW1lQ2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkiY2xhc3NpZmljYXRpb24iOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9DbGFzc2lmaWNhdGlvbkNoYXJhY3RlcmlzdGljIgoJCQkJCX0KCQkJCX0sCgkJCQkicmVxdWlyZWQiOiBbCgkJCQkJIm1hbnVmYWN0dXJlclBhcnRJZCIsCgkJCQkJIm5hbWVBdE1hbnVmYWN0dXJlciIsCgkJCQkJImNsYXNzaWZpY2F0aW9uIgoJCQkJXQoJCQl9CgkJfQoJfSwKCSJwcm9wZXJ0aWVzIjogewoJCSJjYXRlbmFYSWQiOiB7CgkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9DYXRlbmFYSWRUcmFpdCIKCQl9LAoJCSJsb2NhbElkZW50aWZpZXJzIjogewoJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfTG9jYWxJZGVudGlmaWVyQ2hhcmFjdGVyaXN0aWMiCgkJfSwKCQkibWFudWZhY3R1cmluZ0luZm9ybWF0aW9uIjogewoJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfTWFudWZhY3R1cmluZ0NoYXJhY3RlcmlzdGljIgoJCX0sCgkJInBhcnRUeXBlSW5mb3JtYXRpb24iOiB7CgkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0VHlwZUluZm9ybWF0aW9uQ2hhcmFjdGVyaXN0aWMiCgkJfQoJfSwKCSJyZXF1aXJlZCI6IFsKCQkiY2F0ZW5hWElkIiwKCQkibG9jYWxJZGVudGlmaWVycyIsCgkJIm1hbnVmYWN0dXJpbmdJbmZvcm1hdGlvbiIsCgkJInBhcnRUeXBlSW5mb3JtYXRpb24iCgldCn0= bpdm: url: # https:// - bpnEndpoint: > + bpnEndpoint: >- {{ tpl (.Values.bpdm.url | default "") . }}/api/catena/legal-entities/{partnerId}?idType={idType} minioUser: "minio" # minioPassword: "minioPass" # From a693fddd267a4c42d1afb3439892fc1da3c8b90f Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Wed, 1 Mar 2023 10:17:14 +0100 Subject: [PATCH 23/44] feat(impl):[TRI-1069] check trigger --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 423d364f35..335b5e3563 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom IRS Root - Root module containing other modules. + Root module containing other modules. Check trigger. irs-testing From 3a2081341cbc3f9d4120ff2c434965f0ec1dab78 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Wed, 1 Mar 2023 10:25:50 +0100 Subject: [PATCH 24/44] feat(impl):[TRI-1069] check trigger --- irs-api/pom.xml | 2 +- irs-models/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/irs-api/pom.xml b/irs-api/pom.xml index aa75c2390e..3a4ebbb0c7 100644 --- a/irs-api/pom.xml +++ b/irs-api/pom.xml @@ -13,7 +13,7 @@ irs-api IRS API - Item Relationship Service + Item Relationship Service Check Trigger diff --git a/irs-models/pom.xml b/irs-models/pom.xml index ff22e32bd2..6739107e28 100644 --- a/irs-models/pom.xml +++ b/irs-models/pom.xml @@ -13,7 +13,7 @@ irs-models IRS Models - Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition. + Check trigger Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition. From 411f091a7907cf011332a8ce0f97c952be9e2d4e Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Wed, 1 Mar 2023 10:31:08 +0100 Subject: [PATCH 25/44] feat(impl):[TRI-1069] check trigger --- .github/workflows/owasp.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml index 62511ea6b5..852bf1ba41 100644 --- a/.github/workflows/owasp.yml +++ b/.github/workflows/owasp.yml @@ -11,20 +11,6 @@ on: paths: - '**/pom.xml' - 'pom.xml' - paths-ignore: - - '**/*.md' - - '**/*.txt' - - 'api/**' - - 'api-tests/**' - - 'charts/**' - - 'ci/**' - - 'docs/**' - - 'dev/**' - - 'testdata-transform/**' - - 'testing/**' - - 'uml-diagrams/**' - - 'README.md' - - 'CHANGELOG.md' schedule: - cron: '0 0 * * *' # Once a day From 422a20033550f4cb7b8f3eba6c1c239aee3d9d07 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Wed, 1 Mar 2023 10:36:22 +0100 Subject: [PATCH 26/44] feat(impl):[TRI-1069] check trigger --- .github/workflows/eclipse-dash.yml | 14 -------------- .github/workflows/int-setup-testdata.yml | 1 - irs-api/pom.xml | 2 +- irs-models/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/eclipse-dash.yml b/.github/workflows/eclipse-dash.yml index 3faee35540..0451757cd1 100644 --- a/.github/workflows/eclipse-dash.yml +++ b/.github/workflows/eclipse-dash.yml @@ -12,20 +12,6 @@ on: paths: - '**/pom.xml' - 'pom.xml' - paths-ignore: - - '**/*.md' - - '**/*.txt' - - 'api/**' - - 'api-tests/**' - - 'charts/**' - - 'ci/**' - - 'docs/**' - - 'dev/**' - - 'testdata-transform/**' - - 'testing/**' - - 'uml-diagrams/**' - - 'README.md' - - 'CHANGELOG.md' jobs: build: diff --git a/.github/workflows/int-setup-testdata.yml b/.github/workflows/int-setup-testdata.yml index 7f2c10adfd..09c96d9e17 100644 --- a/.github/workflows/int-setup-testdata.yml +++ b/.github/workflows/int-setup-testdata.yml @@ -28,7 +28,6 @@ on: required: false type: string - jobs: build: runs-on: ubuntu-latest diff --git a/irs-api/pom.xml b/irs-api/pom.xml index 3a4ebbb0c7..aa75c2390e 100644 --- a/irs-api/pom.xml +++ b/irs-api/pom.xml @@ -13,7 +13,7 @@ irs-api IRS API - Item Relationship Service Check Trigger + Item Relationship Service diff --git a/irs-models/pom.xml b/irs-models/pom.xml index 6739107e28..ff22e32bd2 100644 --- a/irs-models/pom.xml +++ b/irs-models/pom.xml @@ -13,7 +13,7 @@ irs-models IRS Models - Check trigger Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition. + Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition. diff --git a/pom.xml b/pom.xml index 335b5e3563..423d364f35 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom IRS Root - Root module containing other modules. Check trigger. + Root module containing other modules. irs-testing From 928d7fb7f9c1ab93410181e87ddd236ba4736ca1 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Wed, 1 Mar 2023 10:38:44 +0100 Subject: [PATCH 27/44] feat(impl):[TRI-1069] check trigger --- irs-models/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irs-models/pom.xml b/irs-models/pom.xml index ff22e32bd2..6739107e28 100644 --- a/irs-models/pom.xml +++ b/irs-models/pom.xml @@ -13,7 +13,7 @@ irs-models IRS Models - Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition. + Check trigger Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition. From a359aa5d05286b974a6dd969c3a27e6d02ee634e Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Wed, 1 Mar 2023 10:39:39 +0100 Subject: [PATCH 28/44] feat(impl):[TRI-1069] check trigger --- irs-models/pom.xml | 2 +- .../java/org/eclipse/tractusx/irs/component/Relationship.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/irs-models/pom.xml b/irs-models/pom.xml index 6739107e28..ff22e32bd2 100644 --- a/irs-models/pom.xml +++ b/irs-models/pom.xml @@ -13,7 +13,7 @@ irs-models IRS Models - Check trigger Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition. + Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition. diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java index 6efb568ded..e50587c7dc 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java @@ -41,7 +41,7 @@ public class Relationship { private static final int GLOBAL_ASSET_ID_LENGTH = 45; - @Schema(implementation = String.class, description = "CATENA-X global asset id in the format urn:uuid:uuid4.", example = "urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0", + @Schema(implementation = String.class, description = "Check trigger CATENA-X global asset id in the format urn:uuid:uuid4.", example = "urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0", minLength = GLOBAL_ASSET_ID_LENGTH, maxLength = GLOBAL_ASSET_ID_LENGTH, pattern = "^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$") @JsonUnwrapped private GlobalAssetIdentification catenaXId; From 2834b2c274902f0d16f7aa21501dca2b1051787b Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Wed, 1 Mar 2023 10:40:51 +0100 Subject: [PATCH 29/44] feat(impl):[TRI-1069] check trigger --- .../java/org/eclipse/tractusx/irs/component/Relationship.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java index e50587c7dc..6efb568ded 100644 --- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java +++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/Relationship.java @@ -41,7 +41,7 @@ public class Relationship { private static final int GLOBAL_ASSET_ID_LENGTH = 45; - @Schema(implementation = String.class, description = "Check trigger CATENA-X global asset id in the format urn:uuid:uuid4.", example = "urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0", + @Schema(implementation = String.class, description = "CATENA-X global asset id in the format urn:uuid:uuid4.", example = "urn:uuid:6c311d29-5753-46d4-b32c-19b918ea93b0", minLength = GLOBAL_ASSET_ID_LENGTH, maxLength = GLOBAL_ASSET_ID_LENGTH, pattern = "^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$") @JsonUnwrapped private GlobalAssetIdentification catenaXId; From 855fd4964ca0d8a254a1b5e1bf174ec0534e8991 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Wed, 1 Mar 2023 12:09:11 +0100 Subject: [PATCH 30/44] fix(cucumber):[-] Update cucumber to 7.11.1 and rest-assured to 5.3.0 --- cucumber-tests/pom.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cucumber-tests/pom.xml b/cucumber-tests/pom.xml index 049b5253b0..793f9a5d92 100644 --- a/cucumber-tests/pom.xml +++ b/cucumber-tests/pom.xml @@ -14,12 +14,16 @@ IRS Cucumber + + 7.11.1 + + io.cucumber cucumber-bom - 7.9.0 + ${cucumber.version} pom import @@ -79,7 +83,7 @@ io.rest-assured rest-assured - 4.5.1 + 5.3.0 test @@ -95,6 +99,7 @@ test + @@ -111,6 +116,13 @@ org.apache.maven.plugins maven-surefire-plugin 3.0.0-M8 + + + + cucumber.junit-platform.naming-strategy=long + + + From 6b175c093397880b329e15bf77ec13aa27106ec7 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Wed, 1 Mar 2023 14:30:12 +0100 Subject: [PATCH 31/44] chore(licenses):[-] Update license overview in DEPENDENCIES file --- DEPENDENCIES | 228 +++++++++++++++++++++++++-------------------------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 549bc097be..c69e44e21e 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,17 +1,18 @@ -maven/mavencentral/ch.qos.logback/logback-classic/1.2.11, EPL-1.0, approved, CQ13636 -maven/mavencentral/ch.qos.logback/logback-core/1.2.11, EPL-1.0, approved, CQ13635 +maven/mavencentral/ch.qos.logback/logback-classic/1.4.5, EPL-1.0 OR LGPL-2.1-only, approved, #3435 +maven/mavencentral/ch.qos.logback/logback-core/1.4.5, EPL-1.0 OR LGPL-2.1-only, approved, #3373 maven/mavencentral/com.carrotsearch.thirdparty/simple-xml-safe/2.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.2, Apache-2.0, approved, CQ24135 -maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.4, Apache-2.0, approved, CQ24135 +maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.1, Apache-2.0, approved, #5303 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.2, Apache-2.0, approved, #2133 -maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.4, Apache-2.0, approved, CQ24134 -maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, CQ24136 +maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.1, Apache-2.0 AND MIT, approved, #4303 +maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, #2134 +maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.1, Apache-2.0, approved, #4105 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.2, Apache-2.0, approved, #2566 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.4, Apache-2.0, approved, #2566 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.4, Apache-2.0, approved, CQ24138 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.4, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.13.4, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, CQ24208 +maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.1, Apache-2.0, approved, #5933 +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.14.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.1, Apache-2.0, approved, #4699 +maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.14.1, Apache-2.0, approved, #5938 +maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.docker-java/docker-java-api/3.2.13, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.2.13, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #3059 maven/mavencentral/com.github.docker-java/docker-java-transport/3.2.13, Apache-2.0, approved, clearlydefined @@ -21,13 +22,13 @@ maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, maven/mavencentral/com.google.errorprone/error_prone_annotations/2.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654 maven/mavencentral/com.google.guava/guava/30.1.1-jre, Apache-2.0 AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ23244 -maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, LicenseRef-NONE, approved, #803 +maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657 maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195 maven/mavencentral/com.jayway.jsonpath/json-path/2.7.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.nimbusds/lang-tag/1.6, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.22, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.35, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.24.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.43.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.squareup.okhttp3/okhttp/4.10.0, Apache-2.0 AND MPL-2.0, approved, #3057 maven/mavencentral/com.squareup.okio/okio-jvm/3.0.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.vaadin.external.google/android-json/0.0.20131108.vaadin1, Apache-2.0, approved, CQ21310 @@ -39,50 +40,48 @@ maven/mavencentral/commons-io/commons-io/2.11.0, Apache-2.0, approved, CQ23745 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162 maven/mavencentral/commons-validator/commons-validator/1.7, Apache-2.0, approved, clearlydefined maven/mavencentral/dk.brics.automaton/automaton/1.11-8, BSD-2-Clause, approved, clearlydefined -maven/mavencentral/io.github.classgraph/classgraph/4.8.143, MIT, approved, CQ22530 +maven/mavencentral/io.github.classgraph/classgraph/4.8.149, MIT, approved, CQ22530 maven/mavencentral/io.github.openfeign.form/feign-form-spring/3.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.github.openfeign.form/feign-form/3.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.github.openfeign/feign-core/11.10, Apache-2.0, approved, clearlydefined maven/mavencentral/io.github.openfeign/feign-slf4j/11.10, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-annotations/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-bulkhead/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-circuitbreaker/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-consumer/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-core/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-framework-common/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-ratelimiter/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-retry/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-spring-boot2/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-spring/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-timelimiter/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.micrometer/micrometer-core/1.9.5, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-annotations/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-bulkhead/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-circuitbreaker/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-consumer/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-core/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-framework-common/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-ratelimiter/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-retry/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-spring-boot3/2.0.2, Apache-2.0, approved, #7276 +maven/mavencentral/io.github.resilience4j/resilience4j-spring6/2.0.2, Apache-2.0, approved, #7277 +maven/mavencentral/io.github.resilience4j/resilience4j-timelimiter/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.micrometer/micrometer-commons/1.10.3, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.micrometer/micrometer-core/1.10.3, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #6977 +maven/mavencentral/io.micrometer/micrometer-observation/1.10.3, Apache-2.0, approved, clearlydefined maven/mavencentral/io.micrometer/micrometer-registry-prometheus/1.10.0, Apache-2.0, approved, #4721 maven/mavencentral/io.minio/minio/8.4.5, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient/0.16.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient_common/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_common/0.16.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient_tracer_common/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_tracer_common/0.16.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient_tracer_otel/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_tracer_otel/0.16.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient_tracer_otel_agent/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_tracer_otel_agent/0.16.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.7, Apache-2.0, approved, #5947 maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.7, Apache-2.0, approved, #5929 maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.7, Apache-2.0, approved, #5919 maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.swagger/swagger-annotations/1.6.8, Apache-2.0, approved, #3792 -maven/mavencentral/io.vavr/vavr-match/0.10.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.vavr/vavr/0.10.2, Apache-2.0, approved, clearlydefined maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf -maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf -maven/mavencentral/jakarta.annotation/jakarta.annotation-api/1.3.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca -maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, ee4j.bean-validation +maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf +maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca +maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.bean-validation maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.2, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.3, BSD-3-Clause, approved, ee4j.jaxb +maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636 -maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.18, Apache-2.0, approved, #1810 -maven/mavencentral/net.bytebuddy/byte-buddy/1.12.18, Apache-2.0 AND BSD-3-Clause, approved, #1811 +maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.22, Apache-2.0, approved, #1810 +maven/mavencentral/net.bytebuddy/byte-buddy/1.12.22, Apache-2.0 AND BSD-3-Clause, approved, #1811 maven/mavencentral/net.datafaker/datafaker/1.6.0, MIT AND Apache-2.0 AND CC-BY-SA-3.0, approved, #3324 maven/mavencentral/net.java.dev.jna/jna/5.8.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ23217 maven/mavencentral/net.jimblackler.jsonschemafriend/core/0.11.4, Apache-2.0, approved, #3269 @@ -91,18 +90,19 @@ maven/mavencentral/net.jimblackler/jsonschemafriend/0.11.4, Apache-2.0, approved maven/mavencentral/net.minidev/accessors-smart/2.4.8, Apache-2.0, approved, clearlydefined maven/mavencentral/net.minidev/json-smart/2.4.8, Apache-2.0, approved, #3288 maven/mavencentral/org.apache.commons/commons-compress/1.21, Apache-2.0 AND BSD-3-Clause AND bzip2-1.0.6 AND LicenseRef-Public-Domain, approved, CQ23710 +maven/mavencentral/org.apache.commons/commons-compress/1.22, Apache-2.0 AND BSD-3-Clause, approved, #4299 maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.apache.logging.log4j/log4j-api/2.17.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.apache.logging.log4j/log4j-core/2.17.2, Apache-2.0, approved, #2168 -maven/mavencentral/org.apache.logging.log4j/log4j-jul/2.17.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.apache.logging.log4j/log4j-slf4j-impl/2.17.2, Apache-2.0, approved, #2537 -maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.17.2, Apache-2.0, approved, #2163 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.68, , approved, CQ20188 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.68, Apache-2.0, approved, CQ20193 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.68, Apache-2.0, approved, CQ20194 +maven/mavencentral/org.apache.logging.log4j/log4j-api/2.19.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.apache.logging.log4j/log4j-core/2.19.0, Apache-2.0 AND (Apache-2.0 AND LGPL-2.0-or-later), approved, #5009 +maven/mavencentral/org.apache.logging.log4j/log4j-jul/2.19.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.apache.logging.log4j/log4j-slf4j2-impl/2.19.0, Apache-2.0, approved, #7278 +maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.19.0, Apache-2.0, approved, #5941 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.5, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.5, Apache-2.0, approved, #6997 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.5, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.aspectj/aspectjweaver/1.9.7, EPL-1.0, approved, tools.aspectj -maven/mavencentral/org.assertj/assertj-core/3.22.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.aspectj/aspectjweaver/1.9.19, EPL-1.0, approved, tools.aspectj +maven/mavencentral/org.assertj/assertj-core/3.23.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.69, MIT, approved, clearlydefined maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.69, MIT, approved, clearlydefined maven/mavencentral/org.bouncycastle/bcutil-jdk15on/1.69, MIT, approved, clearlydefined @@ -112,89 +112,89 @@ maven/mavencentral/org.eclipse.dataspaceconnector/contract-spi/0.0.1-milestone-6 maven/mavencentral/org.eclipse.dataspaceconnector/core-spi/0.0.1-milestone-6, Apache-2.0, approved, #5189 maven/mavencentral/org.eclipse.dataspaceconnector/policy-evaluator/0.0.1-milestone-6, Apache-2.0, approved, #5188 maven/mavencentral/org.eclipse.dataspaceconnector/policy-spi/0.0.1-milestone-6, Apache-2.0, approved, #5192 -maven/mavencentral/org.eclipse.tractusx.irs/irs-api/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-models/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-api/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-models/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, CQ23997 -maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, , approved, CQ13192 -maven/mavencentral/org.hibernate.validator/hibernate-validator/6.2.5.Final, Apache-2.0, approved, CQ23258 +maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined +maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.0.Final, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jboss.logging/jboss-logging/3.4.1.Final, Apache-2.0, approved, CQ21255 -maven/mavencentral/org.jboss.logging/jboss-logging/3.4.3.Final, Apache-2.0, approved, CQ21255 +maven/mavencentral/org.jboss.logging/jboss-logging/3.5.0.Final, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.21, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.7.22, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.5.31, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.21, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.7.22, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.5.31, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.21, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.7.22, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.20, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.21, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.7.22, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains/annotations/15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jsoup/jsoup/1.15.3, MIT, approved, #3272 -maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.8.2, EPL-2.0, approved, #1291 -maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.8.2, EPL-2.0, approved, #1488 -maven/mavencentral/org.junit.jupiter/junit-jupiter/5.8.2, EPL-2.0, approved, clearlydefined -maven/mavencentral/org.junit.platform/junit-platform-commons/1.8.2, EPL-2.0, approved, #1288 -maven/mavencentral/org.mockito/mockito-core/4.5.1, MIT AND Apache-2.0, approved, CQ24117 -maven/mavencentral/org.mockito/mockito-junit-jupiter/4.5.1, MIT, approved, clearlydefined +maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.2, EPL-2.0, approved, #3133 +maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.2, EPL-2.0, approved, #3134 +maven/mavencentral/org.junit.jupiter/junit-jupiter/5.9.2, EPL-2.0, approved, #6972 +maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.2, EPL-2.0, approved, #3130 +maven/mavencentral/org.mockito/mockito-core/4.8.1, MIT, approved, clearlydefined +maven/mavencentral/org.mockito/mockito-junit-jupiter/4.8.1, MIT, approved, clearlydefined maven/mavencentral/org.opentest4j/opentest4j/1.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.ow2.asm/asm/9.1, BSD-3-Clause, approved, CQ23029 -maven/mavencentral/org.ow2.asm/asm/9.4, BSD-3-Clause, approved, CQ24269 maven/mavencentral/org.projectlombok/lombok/1.18.24, MIT AND LicenseRef-Public-Domain, approved, CQ23907 maven/mavencentral/org.rnorth.duct-tape/duct-tape/1.0.8, MIT, approved, clearlydefined maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.slf4j/jul-to-slf4j/1.7.36, MIT, approved, CQ12842 -maven/mavencentral/org.slf4j/slf4j-api/1.7.32, MIT, approved, CQ13368 -maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368 +maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.6, MIT, approved, clearlydefined +maven/mavencentral/org.slf4j/slf4j-api/2.0.2, MIT, approved, #5915 +maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915 maven/mavencentral/org.springdoc/springdoc-openapi-common/1.6.7, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springdoc/springdoc-openapi-ui/1.6.7, Apache-2.0, approved, #4347 -maven/mavencentral/org.springdoc/springdoc-openapi-webmvc-core/1.6.7, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/2.7.5, Apache-2.0, approved, #3273 -maven/mavencentral/org.springframework.boot/spring-boot-actuator/2.7.5, Apache-2.0, approved, #4316 -maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.5, Apache-2.0, approved, #4314 -maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/2.7.5, Apache-2.0, approved, #4318 -maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/2.7.5, Apache-2.0, approved, #4310 -maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.5, Apache-2.0, approved, #4307 -maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/2.7.5, Apache-2.0, approved, #4311 -maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.5, Apache-2.0, approved, #4327 -maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/2.7.5, Apache-2.0, approved, #4312 -maven/mavencentral/org.springframework.boot/spring-boot-starter-security/2.7.5, Apache-2.0, approved, #4309 -maven/mavencentral/org.springframework.boot/spring-boot-starter-test/2.7.5, Apache-2.0, approved, #4320 -maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/2.7.5, Apache-2.0, approved, #4305 -maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/2.7.5, Apache-2.0, approved, #4321 -maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.5, Apache-2.0, approved, #4304 -maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.5, Apache-2.0, approved, #4308 -maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/2.7.5, Apache-2.0, approved, #4313 -maven/mavencentral/org.springframework.boot/spring-boot-test/2.7.5, Apache-2.0, approved, #4323 -maven/mavencentral/org.springframework.boot/spring-boot/2.7.5, Apache-2.0, approved, #4322 +maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.0.2, Apache-2.0, approved, #5920 +maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.0.2, Apache-2.0, approved, #5950 +maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.0.2, Apache-2.0, approved, #5923 +maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.0.2, Apache-2.0, approved, #6981 +maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.0.2, Apache-2.0, approved, #6983 +maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.0.2, Apache-2.0, approved, #6965 +maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.0.2, Apache-2.0, approved, #7006 +maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.0.2, Apache-2.0, approved, #6982 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.0.2, Apache-2.0, approved, #5932 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/3.0.2, Apache-2.0, approved, #6967 +maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.0.2, Apache-2.0, approved, #7001 +maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.0.2, Apache-2.0, approved, #6987 +maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.0.2, Apache-2.0, approved, #6971 +maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.0.2, Apache-2.0, approved, #5945 +maven/mavencentral/org.springframework.boot/spring-boot-starter/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.0.2, Apache-2.0, approved, #6966 +maven/mavencentral/org.springframework.boot/spring-boot-test/3.0.2, Apache-2.0, approved, #6976 +maven/mavencentral/org.springframework.boot/spring-boot/3.0.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.springframework.cloud/spring-cloud-commons/3.1.5, Apache-2.0, approved, #4726 maven/mavencentral/org.springframework.cloud/spring-cloud-context/3.1.5, Apache-2.0, approved, #4722 maven/mavencentral/org.springframework.cloud/spring-cloud-openfeign-core/3.1.5, Apache-2.0, approved, #4724 maven/mavencentral/org.springframework.cloud/spring-cloud-starter-openfeign/3.1.5, Apache-2.0, approved, #4725 maven/mavencentral/org.springframework.cloud/spring-cloud-starter/3.1.5, Apache-2.0, approved, #4723 -maven/mavencentral/org.springframework.data/spring-data-commons/2.7.5, Apache-2.0, approved, #2768 -maven/mavencentral/org.springframework.security/spring-security-config/5.7.5, Apache-2.0, approved, #4315 -maven/mavencentral/org.springframework.security/spring-security-core/5.7.5, Apache-2.0, approved, #4269 -maven/mavencentral/org.springframework.security/spring-security-crypto/5.7.5, Apache-2.0 AND ISC, approved, #4268 -maven/mavencentral/org.springframework.security/spring-security-oauth2-client/5.7.5, Apache-2.0, approved, #4326 -maven/mavencentral/org.springframework.security/spring-security-oauth2-core/5.7.5, Apache-2.0, approved, #4325 -maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/5.7.5, Apache-2.0, approved, #4317 -maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/5.7.5, Apache-2.0, approved, #4306 +maven/mavencentral/org.springframework.data/spring-data-commons/3.0.1, Apache-2.0, approved, #5943 +maven/mavencentral/org.springframework.security/spring-security-config/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-core/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-crypto/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.0.1, Apache-2.0, approved, #5931 +maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/6.0.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.springframework.security/spring-security-rsa/1.0.11.RELEASE, Apache-2.0, approved, CQ20647 -maven/mavencentral/org.springframework.security/spring-security-web/5.7.5, Apache-2.0, approved, #4319 -maven/mavencentral/org.springframework/spring-aop/5.3.23, Apache-2.0, approved, CQ24237 -maven/mavencentral/org.springframework/spring-beans/5.3.23, Apache-2.0, approved, CQ24234 -maven/mavencentral/org.springframework/spring-context/5.3.23, Apache-2.0, approved, CQ24233 -maven/mavencentral/org.springframework/spring-core/5.3.23, Apache-2.0 AND BSD-3-Clause, approved, CQ24026 -maven/mavencentral/org.springframework/spring-expression/5.3.23, Apache-2.0, approved, CQ23155 -maven/mavencentral/org.springframework/spring-jcl/5.3.23, Apache-2.0, approved, CQ23156 -maven/mavencentral/org.springframework/spring-test/5.3.23, Apache-2.0, approved, CQ23054 -maven/mavencentral/org.springframework/spring-web/5.3.23, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ24028 -maven/mavencentral/org.springframework/spring-webmvc/5.3.23, Apache-2.0, approved, CQ23158 -maven/mavencentral/org.testcontainers/junit-jupiter/1.17.5, MIT, approved, clearlydefined -maven/mavencentral/org.testcontainers/testcontainers/1.17.5, MIT, approved, #3074 -maven/mavencentral/org.webjars/swagger-ui/4.10.3, Apache-2.0 AND (BSD-3-Clause AND MIT) AND MIT, approved, #3060 -maven/mavencentral/org.webjars/webjars-locator-core/0.50, MIT, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-web/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework/spring-aop/6.0.4, Apache-2.0, approved, #5940 +maven/mavencentral/org.springframework/spring-beans/6.0.4, Apache-2.0, approved, #5937 +maven/mavencentral/org.springframework/spring-context/6.0.4, Apache-2.0, approved, #5936 +maven/mavencentral/org.springframework/spring-core/6.0.4, Apache-2.0 AND BSD-3-Clause, approved, #5948 +maven/mavencentral/org.springframework/spring-expression/6.0.4, Apache-2.0, approved, #3284 +maven/mavencentral/org.springframework/spring-jcl/6.0.4, Apache-2.0, approved, #3283 +maven/mavencentral/org.springframework/spring-test/6.0.4, Apache-2.0, approved, #7003 +maven/mavencentral/org.springframework/spring-web/6.0.4, Apache-2.0, approved, #5942 +maven/mavencentral/org.springframework/spring-webmvc/6.0.4, Apache-2.0, approved, #5944 +maven/mavencentral/org.testcontainers/junit-jupiter/1.17.6, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/testcontainers/1.17.6, MIT, approved, #3074 +maven/mavencentral/org.webjars/swagger-ui/4.15.5, Apache-2.0 AND MIT, approved, #5921 +maven/mavencentral/org.webjars/webjars-locator-core/0.52, MIT, approved, clearlydefined maven/mavencentral/org.xerial.snappy/snappy-java/1.1.8.4, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.xmlunit/xmlunit-core/2.9.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272 maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined From e2d6a9423c9478808b888d02e5ed62d7c9a36893 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Wed, 1 Mar 2023 14:51:12 +0100 Subject: [PATCH 32/44] chore(licenses):[-] Add workflow step to verify DEPENDENCIES file --- .github/workflows/eclipse-dash.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/eclipse-dash.yml b/.github/workflows/eclipse-dash.yml index 0451757cd1..0555c7827a 100644 --- a/.github/workflows/eclipse-dash.yml +++ b/.github/workflows/eclipse-dash.yml @@ -36,6 +36,12 @@ jobs: run: | mvn --batch-mode --update-snapshots verify -Ddash.fail=true -DskipTests + - name: Ensure DEPENDENCIES file is reflecting the current state + run: | + mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES-gen + diff DEPENDENCIES DEPENDENCIES-gen + + - name: upload results if: always() uses: actions/upload-artifact@v3 From 468c014324c308847a2a5f59847893bd2632905b Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 2 Mar 2023 12:02:24 +0100 Subject: [PATCH 33/44] feat(INSTALL):[TRI-1103] Add INSTALL.md --- INSTALL.md | 524 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 524 insertions(+) create mode 100644 INSTALL.md diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 0000000000..66a8e2b12d --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,524 @@ +# Installation Instructions + +The deployment contains the components required to connect the IRS to an existing Catena-X network. This includes: + +- IRS with Minio - part of the "irs-helm" Helm chart + +- EDC Consumer (controlplane & dataplane) - part of the "irs-edc-consumer" Helm chart + +Everything else needs to be provided externally. + +## Data Chain Kit + +You can use the Data Chain Kit to deploy the whole demo scenario with all participating components. +Instructions can be found here [Data Chain Kit](https://eclipse-tractusx.github.io/docs/kits/Data%20Chain%20Kit/Operation%20View/). + +## Installation + +The IRS Helm repository can be found here: [https://eclipse-tractusx.github.io/item-relationship-service/index.yaml](https://eclipse-tractusx.github.io/docs/kits/Data%20Chain%20Kit/Operation%20View/) + +Use the latest release of the "irs-helm" chart. +It contains all required dependencies. + +If you also want to set up your own EDC consumer, use the "irs-edc-consumer" chart. + +Supply the required configuration properties (see chapter [Configuration](#configuration)) in a values.yaml file or +override the settings directly. + +### Deployment using Helm + +Add the IRS Helm repository: + +```(shell) + helm repo add irs https://eclipse-tractusx.github.io/item-relationship-service +``` + +Then install the Helm chart into your cluster: + +```(shell) + helm install -f your-values.yaml irs-app irs/irs-helm +``` + +Or create a new Helm chart and use the IRS as a dependency. + +```(yaml) + dependencies: + - name: irs-helm + repository: https://eclipse-tractusx.github.io/item-relationship-service + version: 3.x.x + - name: irs-edc-consumer # optional + repository: https://eclipse-tractusx.github.io/item-relationship-service + version: 1.x.x +``` + +Then provide your configuration as the values.yaml of that chart. + +Create a new application in ArgoCD and point it to your repository / Helm chart folder. + +## Configuration + +Take the following template and adjust the configuration parameters (<placeholders> mark the relevant spots). +You can define the URLs as well as most of the secrets yourself. + +The Keycloak, DAPS and Vault configuration / secrets depend on your setup and might need to be provided externally. + +### Helm configuration IRS (values.yaml) + +```(yaml) + ##################### + # IRS Configuration # + ##################### + irsUrl: "https://" + ingress: + enabled: false + className: "nginx" + annotations: + nginx.ingress.kubernetes.io/ssl-passthrough: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + hosts: + - host: "" + paths: + - path: / + pathType: ImplementationSpecific + tls: + - hosts: + - "" + secretName: tls-secret + digitalTwinRegistry: + url: https:// + descriptorEndpoint: "{{ tpl .Values.digitalTwinRegistry.url . }}/registry/shell-descriptors/{aasIdentifier}" + shellLookupEndpoint: "{{ tpl .Values.digitalTwinRegistry.url . }}/lookup/shells?assetIds={assetIds}" + semanticshub: + url: https:// + modelJsonSchemaEndpoint: "{{ tpl .Values.semanticsHub.url . }}/{urn}/json-schema" + defaultUrns: >- + urn:bamm:io.catenax.serial_part_typization:1.0.0#SerialPartTypization + # ,urn:bamm:com.catenax.assembly_part_relationship:1.0.0#AssemblyPartRelationship + localModels: + # Map of Base64 encoded strings of semantic models. The key must be the Base64 encoded full URN of the model. + # Example for urn:bamm:io.catenax.serial_part_typization:1.1.1#SerialPartTypization: + # dXJuOmJhbW06aW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uOjEuMS4xI1NlcmlhbFBhcnRUeXBpemF0aW9u: ewoJIiRzY2hlbWEiOiAiaHR0cDovL2pzb24tc2NoZW1hLm9yZy9kcmFmdC0wNC9zY2hlbWEiLAoJInR5cGUiOiAib2JqZWN0IiwKCSJjb21wb25lbnRzIjogewoJCSJzY2hlbWFzIjogewoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0NhdGVuYVhJZFRyYWl0IjogewoJCQkJInR5cGUiOiAic3RyaW5nIiwKCQkJCSJwYXR0ZXJuIjogIiheWzAtOWEtZkEtRl17OH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17MTJ9JCl8KF51cm46dXVpZDpbMC05YS1mQS1GXXs4fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXsxMn0kKSIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9LZXlDaGFyYWN0ZXJpc3RpYyI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9WYWx1ZUNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAic3RyaW5nIgoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0tleVZhbHVlTGlzdCI6IHsKCQkJCSJ0eXBlIjogIm9iamVjdCIsCgkJCQkicHJvcGVydGllcyI6IHsKCQkJCQkia2V5IjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfS2V5Q2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkidmFsdWUiOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9WYWx1ZUNoYXJhY3RlcmlzdGljIgoJCQkJCX0KCQkJCX0sCgkJCQkicmVxdWlyZWQiOiBbCgkJCQkJImtleSIsCgkJCQkJInZhbHVlIgoJCQkJXQoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0xvY2FsSWRlbnRpZmllckNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAiYXJyYXkiLAoJCQkJIml0ZW1zIjogewoJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9LZXlWYWx1ZUxpc3QiCgkJCQl9LAoJCQkJInVuaXF1ZUl0ZW1zIjogdHJ1ZQoJCQl9LAoJCQkidXJuX2JhbW1faW8ub3Blbm1hbnVmYWN0dXJpbmdfY2hhcmFjdGVyaXN0aWNfMi4wLjBfVGltZXN0YW1wIjogewoJCQkJInR5cGUiOiAic3RyaW5nIiwKCQkJCSJwYXR0ZXJuIjogIi0/KFsxLTldWzAtOV17Myx9fDBbMC05XXszfSktKDBbMS05XXwxWzAtMl0pLSgwWzEtOV18WzEyXVswLTldfDNbMDFdKVQoKFswMV1bMC05XXwyWzAtM10pOlswLTVdWzAtOV06WzAtNV1bMC05XShcXC5bMC05XSspP3woMjQ6MDA6MDAoXFwuMCspPykpKFp8KFxcK3wtKSgoMFswLTldfDFbMC0zXSk6WzAtNV1bMC05XXwxNDowMCkpPyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9Qcm9kdWN0aW9uQ291bnRyeUNvZGVUcmFpdCI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIsCgkJCQkicGF0dGVybiI6ICJeW0EtWl1bQS1aXVtBLVpdJCIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9NYW51ZmFjdHVyaW5nQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJvYmplY3QiLAoJCQkJInByb3BlcnRpZXMiOiB7CgkJCQkJImRhdGUiOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLm9wZW5tYW51ZmFjdHVyaW5nX2NoYXJhY3RlcmlzdGljXzIuMC4wX1RpbWVzdGFtcCIKCQkJCQl9LAoJCQkJCSJjb3VudHJ5IjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUHJvZHVjdGlvbkNvdW50cnlDb2RlVHJhaXQiCgkJCQkJfQoJCQkJfSwKCQkJCSJyZXF1aXJlZCI6IFsKCQkJCQkiZGF0ZSIKCQkJCV0KCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0SWRDaGFyYWN0ZXJpc3RpYyI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0TmFtZUNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAic3RyaW5nIgoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0NsYXNzaWZpY2F0aW9uQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJzdHJpbmciLAoJCQkJImVudW0iOiBbCgkJCQkJInByb2R1Y3QiLAoJCQkJCSJyYXcgbWF0ZXJpYWwiLAoJCQkJCSJzb2Z0d2FyZSIsCgkJCQkJImFzc2VtYmx5IiwKCQkJCQkidG9vbCIsCgkJCQkJImNvbXBvbmVudCIKCQkJCV0KCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0VHlwZUluZm9ybWF0aW9uQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJvYmplY3QiLAoJCQkJInByb3BlcnRpZXMiOiB7CgkJCQkJIm1hbnVmYWN0dXJlclBhcnRJZCI6IHsKCQkJCQkJIiRyZWYiOiAiIy9jb21wb25lbnRzL3NjaGVtYXMvdXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX1BhcnRJZENoYXJhY3RlcmlzdGljIgoJCQkJCX0sCgkJCQkJImN1c3RvbWVyUGFydElkIjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUGFydElkQ2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkibmFtZUF0TWFudWZhY3R1cmVyIjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUGFydE5hbWVDaGFyYWN0ZXJpc3RpYyIKCQkJCQl9LAoJCQkJCSJuYW1lQXRDdXN0b21lciI6IHsKCQkJCQkJIiRyZWYiOiAiIy9jb21wb25lbnRzL3NjaGVtYXMvdXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX1BhcnROYW1lQ2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkiY2xhc3NpZmljYXRpb24iOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9DbGFzc2lmaWNhdGlvbkNoYXJhY3RlcmlzdGljIgoJCQkJCX0KCQkJCX0sCgkJCQkicmVxdWlyZWQiOiBbCgkJCQkJIm1hbnVmYWN0dXJlclBhcnRJZCIsCgkJCQkJIm5hbWVBdE1hbnVmYWN0dXJlciIsCgkJCQkJImNsYXNzaWZpY2F0aW9uIgoJCQkJXQoJCQl9CgkJfQoJfSwKCSJwcm9wZXJ0aWVzIjogewoJCSJjYXRlbmFYSWQiOiB7CgkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9DYXRlbmFYSWRUcmFpdCIKCQl9LAoJCSJsb2NhbElkZW50aWZpZXJzIjogewoJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfTG9jYWxJZGVudGlmaWVyQ2hhcmFjdGVyaXN0aWMiCgkJfSwKCQkibWFudWZhY3R1cmluZ0luZm9ybWF0aW9uIjogewoJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfTWFudWZhY3R1cmluZ0NoYXJhY3RlcmlzdGljIgoJCX0sCgkJInBhcnRUeXBlSW5mb3JtYXRpb24iOiB7CgkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0VHlwZUluZm9ybWF0aW9uQ2hhcmFjdGVyaXN0aWMiCgkJfQoJfSwKCSJyZXF1aXJlZCI6IFsKCQkiY2F0ZW5hWElkIiwKCQkibG9jYWxJZGVudGlmaWVycyIsCgkJIm1hbnVmYWN0dXJpbmdJbmZvcm1hdGlvbiIsCgkJInBhcnRUeXBlSW5mb3JtYXRpb24iCgldCn0= + bpdm: + url: https:// + bpnEndpoint: "{{ tpl .Values.bpdm.url . }}/api/catena/legal-entities/{partnerId}?idType={idType}" + minioUser: + minioPassword: + minioUrl: "http://{{ .Release.Name }}-minio:9000" + keycloak: + oauth2: + clientId: + clientSecret: + clientTokenUri: + jwkSetUri: + edc: + controlplane: + endpoint: + data: "" # + request: + ttl: PT10M # Requests to controlplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) + provider: + suffix: /api/v1/ids/data + catalog: + limit: 1000 # Max number of catalog items to retrieve from the controlplane + pagesize: 50 # Number of catalog items to retrieve on one page for pagination + apikey: + header: "X-Api-Key" # Name of the EDC api key header field + secret: "" # + submodel: + request: + ttl: PT10M # Requests to dataplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) + path: /submodel + urnprefix: /urn + + config: + # If true, the config provided below will completely replace the configmap. + # In this case, you need to provide all required config values defined above yourself! + # If false, the custom config will just be appended to the configmap. + override: false + # Provide your custom configuration here (overrides IRS Spring application.yaml) + content: + + + env: [] # You can provide your own environment variables for the IRS here. + # - name: JAVA_TOOL_OPTIONS + # - value: -Dhttps.proxyHost=1.2.3.4 + + ####################### + # Minio Configuration # + ####################### + minio: + enabled: true + mode: standalone + persistence: + size: 1Gi + resources: + requests: + memory: 4Gi + rootUser: + rootPassword: + + environment: + MINIO_PROMETHEUS_JOB_ID: minio-actuator + MINIO_PROMETHEUS_URL: http://prometheus:9090 + + ######################### + # Grafana Configuration # + ######################### + grafana: + enabled: false (1) + rbac: + create: false + persistence: + enabled: false + + user: + password: + + admin: + existingSecret: "{{ .Release.Name }}-irs-helm" + userKey: grafanaUser + passwordKey: grafanaPassword + + datasources: + datasources.yaml: + apiVersion: 1 + datasources: + - name: Prometheus + type: prometheus + url: "http://{{ .Release.Name }}-prometheus-server" + isDefault: true + sidecar: + dashboards: + enabled: true + + importDashboards: + minio: dashboards/minio-dashboard.json + outbound: dashboards/irs-outbound-requests.json + irsmonitoring: dashboards/resource-monitoring-dashboard.json + irsjobs: dashboards/irs-jobs-dashboard.json + irsapi: dashboards/irs-api-dashboard.json + + ############################ + # Prometheus Configuration # + ############################ + prometheus: + enabled: false (1) + rbac: + create: false + alertmanager: + enabled: false + prometheus-node-exporter: + enabled: false + kubeStateMetrics: + enabled: false + prometheus-pushgateway: + enabled: false + configmapReload: + prometheus: + enabled: false + + extraScrapeConfigs: | + - job_name: 'spring-actuator' + metrics_path: '/actuator/prometheus' + scrape_interval: 5s + static_configs: + - targets: [ '{{ .Release.Name }}-irs-helm:4004' ] + + - job_name: 'minio-actuator' + metrics_path: /minio/v2/metrics/cluster + static_configs: + - targets: [ '{{ .Release.Name }}-minio:9000' ] +``` + +| **_(1)_** | Use this to enable or disable the monitoring components | +|-----------|---------------------------------------------------------| + +#### Values explained + +##### <irs-url> + +The hostname where the IRS will be made available. + +##### <digital-twin-registry-url> + +The URL of the Digital Twin Registry. The IRS uses this service to fetch AAS shells. + +##### <semantics-hub-url> + +The URL of the SemanticsHub. The IRS uses this service to fetch aspect schemas for payload validation. + +##### <bpdm-url> + +The URL of the BPDM service. The IRS uses this service to fetch business partner information based on BPNs. + +##### <keycloak-token-uri> + +The URL of the Keycloak token API. Used by the IRS for token creation to authenticate with other services. + +##### <keycloak-jwkset-uri> + +The URL of the Keycloak JWK Set. Used by the IRS to validate tokens when the IRS API is called. + +##### <grafana-url> + +The hostname where Grafana will be made available. + +##### <edc-controlplane-endpoint-data> + +The EDC consumer controlplane endpoint URL for data management, including the protocol. +If left empty, this defaults to the internal endpoint of the controlplane provided by the irs-edc-consumer Helm chart. + +#### Semantic Model Provisioning + +The IRS can retrieve semantic models in two ways: + +1. via the Semantic Hub, if you provide the URL + +2. via local schema files + +If you activate both features, IRS will first try to resolve the models via the Hub and use the +local models as a fallback. + +If you want to use local schema files, you need to provide them directly in the `values.yaml` file. Use the +param `semanticsHub.localModels` to specify a map of all the local schemas. +The **key** of each entry is the `Base64` encoded URN of the model. The **value** is the `Base64` encoded content of the +schema file itself. The entries will then be mounted into the IRS container and used on demand. For reference, see the +example comment in the default `values.yaml`. + +### EDC consumer configuration + +If you want to provide your own EDC consumer, add the following entries to your values.yaml: + +```(yaml) + ############################## + # EDC Postgres Configuration # + ############################## + postgresql: + auth: + username: edc + database: edc + postgresPassword: + password: + + ################################## + # EDC Controlplane Configuration # + ################################## + edc-controlplane: + ingresses: + - enabled: true + hostname: "" + annotations: + nginx.ingress.kubernetes.io/ssl-passthrough: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + endpoints: + - ids + - data + className: "" + tls: + - hosts: + - "" + secretName: tls-secret + certManager: + issuer: "" + clusterIssuer: "" + + edc: + receiver: + callback: + url: "http://{{ .Release.Name }}-irs-helm:8181/internal/endpoint-data-reference" # IRS EDC callback URL, e.g. http://app-irs-helm:8181/internal/endpoint-data-reference + postgresql: + user: edc + password: + transfer: + proxy: + token: + verifier: + publickey: + alias: + signer: + privatekey: + alias: + api: + auth: + key: "" + controlplane: + url: "https://" + dataplane: + url: "https://" + configuration: + properties: |- + edc.oauth.client.id= + edc.oauth.private.key.alias= + edc.oauth.provider.jwks.url= + edc.oauth.public.key.alias= + edc.oauth.token.url= + edc.vault.hashicorp.url= + edc.vault.hashicorp.token= + edc.vault.hashicorp.api.secret.path= + edc.data.encryption.keys.alias= + edc.data.encryption.algorithm=NONE + + ############################### + # EDC Dataplane Configuration # + ############################### + edc-dataplane: + edc: + api: + auth: + key: "" + ## Ingress declaration to expose the network service. + ingresses: + - enabled: true + hostname: "" + annotations: + nginx.ingress.kubernetes.io/ssl-passthrough: "false" + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + endpoints: + - public + className: "nginx" + tls: + - hosts: + - "" + secretName: tls-secret + certManager: + issuer: "" + clusterIssuer: "" + + configuration: + properties: |- + edc.oauth.client.id= + edc.oauth.private.key.alias= + edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL + edc.oauth.provider.jwks.url= + edc.oauth.public.key.alias= + edc.oauth.token.url= + edc.vault.hashicorp.url= + edc.vault.hashicorp.token= + edc.vault.hashicorp.api.secret.path= +``` + +#### Values explained + +EDC requires a DAPS instance to function correctly. For more information on this, please refer to +the [DAPS](https://github.com/catenax-ng/product-DAPS) or the [EDC](https://github.com/catenax-ng/product-edc) +documentation. + +##### <controlplane-url> + +The hostname where the EDC consumer controlplane will be made available. + +##### <dataplane-url> + +The hostname where the EDC consumer dataplane will be made available. + +##### <vault-url> + +The base URL of the Vault instance. +EDC requires a running instance of HashiCorp Vault to store the DAPS certificate and private key. + +##### <vault-secret-store-path> + +The path to the secret store in Vault where the DAPS certificate and key can be found. +_Example: /v1/team-name_ + +##### <daps-certificate-name> + +The name of the DAPS certificate in the Vault. +_Example: irs-daps-certificate_ + +##### <daps-privatekey-name> + +The name of the DAPS private key in the Vault. +_Example: irs-daps-private-key_ + +##### <daps-client-id> + +The DAPS client ID. + +##### <daps-jwks-url> + +The URL of the DAPS JWK Set. +_Example: [https://daps-hostname/.well-known/jwks.json](https://daps-hostname/.well-known/jwks.json)_ + +##### <daps-token-url> + +The URL of the DAPS token API. +_Example: [https://daps-hostname/token](https://daps-hostname/token)_ + +### Secrets + +This is a list of all secrets used in the deployment. +**_Keep the values for these settings safe and do not publish them!_** + +#### <postgres-admin-password> + +Database password for the **postgres** user. To be defined by you. + +#### <postgres-password> + +Database password for the application user (default username: **edc**). To be defined by you. + +#### <keycloak-client-id> + +Client ID for Keycloak. Request this from your Keycloak operator. + +#### <keycloak-client-secret> + +Client secret for Keycloak. Request this from your Keycloak operator. + +#### <minio-username> + +Login username for Minio. To be defined by you. + +#### <minio-password> + +Login password for Minio. To be defined by you. + +#### <edc-api-key> + +An API key for the EDC API. To be defined by you. + +#### <vault-token> + +The access token for the HashiCorp Vault API. + +#### <grafana-username> + +Login username for Grafana. To be defined by you. + +#### <grafana-password> + +Login password for Grafana. To be defined by you. + +## Troubleshooting + +### Proxy support + +If you are using an HTTP(S) proxy for outgoing connections, you need to configure the IRS to use it. + +```(yaml) +JAVA_TOOL_OPTIONS=-Dhttps.proxyHost=X.X.X.X -Dhttps.proxyPort=XXXX +``` + +You might need to specify both `http` and `https` options, dependending on your configuration. + +If your proxy is requiring authentication, you can use the `.proxyUser` and `.proxyPassword` properties in addition. + +### Troubleshooting FAQ + +#### Minio + +##### Error: "The specified bucket does not exist" + +IRS tries to read data from or write to the Minio storage, but no bucket exists. This can happen if Minio is running +without a persistent volume and restarts, thus losing all data. +It can also happen if the persistent volume claim is deleted / recreated. + +**Proposed solution steps:** + +1. Make sure Minio is configured and running correctly. + +2. Restart the IRS - this will recreate the missing bucket automatically. From af91a87489d8f45af1eaac233f4a798bf59553b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 11:11:24 +0000 Subject: [PATCH 34/44] chore(deps): bump micrometer-registry-prometheus from 1.10.0 to 1.10.4 Bumps [micrometer-registry-prometheus](https://github.com/micrometer-metrics/micrometer) from 1.10.0 to 1.10.4. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.10.0...v1.10.4) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-registry-prometheus dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 423d364f35..7f3a3a5d4c 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.0.2 3.1.5 1.6.7 - 1.10.0 + 1.10.4 5.8.2 1.6.0 2.36.0 From f7c658f2564ad161ee20b02ab5cc9dc7e6258de2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 11:11:32 +0000 Subject: [PATCH 35/44] chore(deps): bump checkstyle from 10.7.0 to 10.8.0 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.7.0 to 10.8.0. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.7.0...checkstyle-10.8.0) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 423d364f35..21789662e9 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 4.7.3.0 1.12.0 3.2.1 - 10.7.0 + 10.8.0 0.8.8 3.19.0 7.4.4 From d05d789869989fe910d55f6a9efb5c459d8571f6 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 2 Mar 2023 12:46:30 +0100 Subject: [PATCH 36/44] feat(INSTALL):[TRI-1103] Add link to documentation --- INSTALL.md | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 66a8e2b12d..7a0bb6049d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -3,15 +3,14 @@ The deployment contains the components required to connect the IRS to an existing Catena-X network. This includes: - IRS with Minio - part of the "irs-helm" Helm chart - - EDC Consumer (controlplane & dataplane) - part of the "irs-edc-consumer" Helm chart Everything else needs to be provided externally. ## Data Chain Kit -You can use the Data Chain Kit to deploy the whole demo scenario with all participating components. -Instructions can be found here [Data Chain Kit](https://eclipse-tractusx.github.io/docs/kits/Data%20Chain%20Kit/Operation%20View/). +You can use the Data Chain Kit to deploy the whole demo scenario with all participating components. +Instructions can be found here: [Data Chain Kit](https://eclipse-tractusx.github.io/docs/kits/Data%20Chain%20Kit/Operation%20View/). ## Installation @@ -25,6 +24,8 @@ If you also want to set up your own EDC consumer, use the "irs-edc-consumer" cha Supply the required configuration properties (see chapter [Configuration](#configuration)) in a values.yaml file or override the settings directly. +More information: [Administration Guide](https://eclipse-tractusx.github.io/item-relationship-service/docs/administration/administration-guide.html) + ### Deployment using Helm Add the IRS Helm repository: @@ -493,32 +494,3 @@ Login username for Grafana. To be defined by you. Login password for Grafana. To be defined by you. -## Troubleshooting - -### Proxy support - -If you are using an HTTP(S) proxy for outgoing connections, you need to configure the IRS to use it. - -```(yaml) -JAVA_TOOL_OPTIONS=-Dhttps.proxyHost=X.X.X.X -Dhttps.proxyPort=XXXX -``` - -You might need to specify both `http` and `https` options, dependending on your configuration. - -If your proxy is requiring authentication, you can use the `.proxyUser` and `.proxyPassword` properties in addition. - -### Troubleshooting FAQ - -#### Minio - -##### Error: "The specified bucket does not exist" - -IRS tries to read data from or write to the Minio storage, but no bucket exists. This can happen if Minio is running -without a persistent volume and restarts, thus losing all data. -It can also happen if the persistent volume claim is deleted / recreated. - -**Proposed solution steps:** - -1. Make sure Minio is configured and running correctly. - -2. Restart the IRS - this will recreate the missing bucket automatically. From 15823e7bb31bebecced5b695f2d84aeb0b4396a4 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Thu, 2 Mar 2023 12:46:51 +0100 Subject: [PATCH 37/44] feat(impl):[TRI-XXX] fix security vulnerability --- irs-api/pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/irs-api/pom.xml b/irs-api/pom.xml index aa75c2390e..88b1a3edfc 100644 --- a/irs-api/pom.xml +++ b/irs-api/pom.xml @@ -102,18 +102,6 @@ org.springframework.data spring-data-commons - - - org.springframework.cloud - spring-cloud-starter-openfeign - ${springcloud-feign.version} - - - commons-io - commons-io - - - commons-io commons-io From cd12ac01cd9fbeb5e4728b529b461f0555bd663f Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 2 Mar 2023 12:51:25 +0100 Subject: [PATCH 38/44] feat(INSTALL):[TRI-1103] Link to documentation for configuration --- INSTALL.md | 439 +---------------------------------------------------- 1 file changed, 1 insertion(+), 438 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 7a0bb6049d..ae323a3986 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -24,8 +24,6 @@ If you also want to set up your own EDC consumer, use the "irs-edc-consumer" cha Supply the required configuration properties (see chapter [Configuration](#configuration)) in a values.yaml file or override the settings directly. -More information: [Administration Guide](https://eclipse-tractusx.github.io/item-relationship-service/docs/administration/administration-guide.html) - ### Deployment using Helm Add the IRS Helm repository: @@ -58,439 +56,4 @@ Create a new application in ArgoCD and point it to your repository / Helm chart ## Configuration -Take the following template and adjust the configuration parameters (<placeholders> mark the relevant spots). -You can define the URLs as well as most of the secrets yourself. - -The Keycloak, DAPS and Vault configuration / secrets depend on your setup and might need to be provided externally. - -### Helm configuration IRS (values.yaml) - -```(yaml) - ##################### - # IRS Configuration # - ##################### - irsUrl: "https://" - ingress: - enabled: false - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/ssl-passthrough: "false" - nginx.ingress.kubernetes.io/backend-protocol: "HTTP" - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - hosts: - - host: "" - paths: - - path: / - pathType: ImplementationSpecific - tls: - - hosts: - - "" - secretName: tls-secret - digitalTwinRegistry: - url: https:// - descriptorEndpoint: "{{ tpl .Values.digitalTwinRegistry.url . }}/registry/shell-descriptors/{aasIdentifier}" - shellLookupEndpoint: "{{ tpl .Values.digitalTwinRegistry.url . }}/lookup/shells?assetIds={assetIds}" - semanticshub: - url: https:// - modelJsonSchemaEndpoint: "{{ tpl .Values.semanticsHub.url . }}/{urn}/json-schema" - defaultUrns: >- - urn:bamm:io.catenax.serial_part_typization:1.0.0#SerialPartTypization - # ,urn:bamm:com.catenax.assembly_part_relationship:1.0.0#AssemblyPartRelationship - localModels: - # Map of Base64 encoded strings of semantic models. The key must be the Base64 encoded full URN of the model. - # Example for urn:bamm:io.catenax.serial_part_typization:1.1.1#SerialPartTypization: - # dXJuOmJhbW06aW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uOjEuMS4xI1NlcmlhbFBhcnRUeXBpemF0aW9u: ewoJIiRzY2hlbWEiOiAiaHR0cDovL2pzb24tc2NoZW1hLm9yZy9kcmFmdC0wNC9zY2hlbWEiLAoJInR5cGUiOiAib2JqZWN0IiwKCSJjb21wb25lbnRzIjogewoJCSJzY2hlbWFzIjogewoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0NhdGVuYVhJZFRyYWl0IjogewoJCQkJInR5cGUiOiAic3RyaW5nIiwKCQkJCSJwYXR0ZXJuIjogIiheWzAtOWEtZkEtRl17OH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17NH0tWzAtOWEtZkEtRl17MTJ9JCl8KF51cm46dXVpZDpbMC05YS1mQS1GXXs4fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXs0fS1bMC05YS1mQS1GXXsxMn0kKSIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9LZXlDaGFyYWN0ZXJpc3RpYyI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9WYWx1ZUNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAic3RyaW5nIgoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0tleVZhbHVlTGlzdCI6IHsKCQkJCSJ0eXBlIjogIm9iamVjdCIsCgkJCQkicHJvcGVydGllcyI6IHsKCQkJCQkia2V5IjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfS2V5Q2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkidmFsdWUiOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9WYWx1ZUNoYXJhY3RlcmlzdGljIgoJCQkJCX0KCQkJCX0sCgkJCQkicmVxdWlyZWQiOiBbCgkJCQkJImtleSIsCgkJCQkJInZhbHVlIgoJCQkJXQoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0xvY2FsSWRlbnRpZmllckNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAiYXJyYXkiLAoJCQkJIml0ZW1zIjogewoJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9LZXlWYWx1ZUxpc3QiCgkJCQl9LAoJCQkJInVuaXF1ZUl0ZW1zIjogdHJ1ZQoJCQl9LAoJCQkidXJuX2JhbW1faW8ub3Blbm1hbnVmYWN0dXJpbmdfY2hhcmFjdGVyaXN0aWNfMi4wLjBfVGltZXN0YW1wIjogewoJCQkJInR5cGUiOiAic3RyaW5nIiwKCQkJCSJwYXR0ZXJuIjogIi0/KFsxLTldWzAtOV17Myx9fDBbMC05XXszfSktKDBbMS05XXwxWzAtMl0pLSgwWzEtOV18WzEyXVswLTldfDNbMDFdKVQoKFswMV1bMC05XXwyWzAtM10pOlswLTVdWzAtOV06WzAtNV1bMC05XShcXC5bMC05XSspP3woMjQ6MDA6MDAoXFwuMCspPykpKFp8KFxcK3wtKSgoMFswLTldfDFbMC0zXSk6WzAtNV1bMC05XXwxNDowMCkpPyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9Qcm9kdWN0aW9uQ291bnRyeUNvZGVUcmFpdCI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIsCgkJCQkicGF0dGVybiI6ICJeW0EtWl1bQS1aXVtBLVpdJCIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9NYW51ZmFjdHVyaW5nQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJvYmplY3QiLAoJCQkJInByb3BlcnRpZXMiOiB7CgkJCQkJImRhdGUiOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLm9wZW5tYW51ZmFjdHVyaW5nX2NoYXJhY3RlcmlzdGljXzIuMC4wX1RpbWVzdGFtcCIKCQkJCQl9LAoJCQkJCSJjb3VudHJ5IjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUHJvZHVjdGlvbkNvdW50cnlDb2RlVHJhaXQiCgkJCQkJfQoJCQkJfSwKCQkJCSJyZXF1aXJlZCI6IFsKCQkJCQkiZGF0ZSIKCQkJCV0KCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0SWRDaGFyYWN0ZXJpc3RpYyI6IHsKCQkJCSJ0eXBlIjogInN0cmluZyIKCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0TmFtZUNoYXJhY3RlcmlzdGljIjogewoJCQkJInR5cGUiOiAic3RyaW5nIgoJCQl9LAoJCQkidXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX0NsYXNzaWZpY2F0aW9uQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJzdHJpbmciLAoJCQkJImVudW0iOiBbCgkJCQkJInByb2R1Y3QiLAoJCQkJCSJyYXcgbWF0ZXJpYWwiLAoJCQkJCSJzb2Z0d2FyZSIsCgkJCQkJImFzc2VtYmx5IiwKCQkJCQkidG9vbCIsCgkJCQkJImNvbXBvbmVudCIKCQkJCV0KCQkJfSwKCQkJInVybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0VHlwZUluZm9ybWF0aW9uQ2hhcmFjdGVyaXN0aWMiOiB7CgkJCQkidHlwZSI6ICJvYmplY3QiLAoJCQkJInByb3BlcnRpZXMiOiB7CgkJCQkJIm1hbnVmYWN0dXJlclBhcnRJZCI6IHsKCQkJCQkJIiRyZWYiOiAiIy9jb21wb25lbnRzL3NjaGVtYXMvdXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX1BhcnRJZENoYXJhY3RlcmlzdGljIgoJCQkJCX0sCgkJCQkJImN1c3RvbWVyUGFydElkIjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUGFydElkQ2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkibmFtZUF0TWFudWZhY3R1cmVyIjogewoJCQkJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfUGFydE5hbWVDaGFyYWN0ZXJpc3RpYyIKCQkJCQl9LAoJCQkJCSJuYW1lQXRDdXN0b21lciI6IHsKCQkJCQkJIiRyZWYiOiAiIy9jb21wb25lbnRzL3NjaGVtYXMvdXJuX2JhbW1faW8uY2F0ZW5heC5zZXJpYWxfcGFydF90eXBpemF0aW9uXzEuMS4xX1BhcnROYW1lQ2hhcmFjdGVyaXN0aWMiCgkJCQkJfSwKCQkJCQkiY2xhc3NpZmljYXRpb24iOiB7CgkJCQkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9DbGFzc2lmaWNhdGlvbkNoYXJhY3RlcmlzdGljIgoJCQkJCX0KCQkJCX0sCgkJCQkicmVxdWlyZWQiOiBbCgkJCQkJIm1hbnVmYWN0dXJlclBhcnRJZCIsCgkJCQkJIm5hbWVBdE1hbnVmYWN0dXJlciIsCgkJCQkJImNsYXNzaWZpY2F0aW9uIgoJCQkJXQoJCQl9CgkJfQoJfSwKCSJwcm9wZXJ0aWVzIjogewoJCSJjYXRlbmFYSWQiOiB7CgkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9DYXRlbmFYSWRUcmFpdCIKCQl9LAoJCSJsb2NhbElkZW50aWZpZXJzIjogewoJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfTG9jYWxJZGVudGlmaWVyQ2hhcmFjdGVyaXN0aWMiCgkJfSwKCQkibWFudWZhY3R1cmluZ0luZm9ybWF0aW9uIjogewoJCQkiJHJlZiI6ICIjL2NvbXBvbmVudHMvc2NoZW1hcy91cm5fYmFtbV9pby5jYXRlbmF4LnNlcmlhbF9wYXJ0X3R5cGl6YXRpb25fMS4xLjFfTWFudWZhY3R1cmluZ0NoYXJhY3RlcmlzdGljIgoJCX0sCgkJInBhcnRUeXBlSW5mb3JtYXRpb24iOiB7CgkJCSIkcmVmIjogIiMvY29tcG9uZW50cy9zY2hlbWFzL3Vybl9iYW1tX2lvLmNhdGVuYXguc2VyaWFsX3BhcnRfdHlwaXphdGlvbl8xLjEuMV9QYXJ0VHlwZUluZm9ybWF0aW9uQ2hhcmFjdGVyaXN0aWMiCgkJfQoJfSwKCSJyZXF1aXJlZCI6IFsKCQkiY2F0ZW5hWElkIiwKCQkibG9jYWxJZGVudGlmaWVycyIsCgkJIm1hbnVmYWN0dXJpbmdJbmZvcm1hdGlvbiIsCgkJInBhcnRUeXBlSW5mb3JtYXRpb24iCgldCn0= - bpdm: - url: https:// - bpnEndpoint: "{{ tpl .Values.bpdm.url . }}/api/catena/legal-entities/{partnerId}?idType={idType}" - minioUser: - minioPassword: - minioUrl: "http://{{ .Release.Name }}-minio:9000" - keycloak: - oauth2: - clientId: - clientSecret: - clientTokenUri: - jwkSetUri: - edc: - controlplane: - endpoint: - data: "" # - request: - ttl: PT10M # Requests to controlplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) - provider: - suffix: /api/v1/ids/data - catalog: - limit: 1000 # Max number of catalog items to retrieve from the controlplane - pagesize: 50 # Number of catalog items to retrieve on one page for pagination - apikey: - header: "X-Api-Key" # Name of the EDC api key header field - secret: "" # - submodel: - request: - ttl: PT10M # Requests to dataplane will time out after this duration (see https://en.wikipedia.org/wiki/ISO_8601#Durations) - path: /submodel - urnprefix: /urn - - config: - # If true, the config provided below will completely replace the configmap. - # In this case, you need to provide all required config values defined above yourself! - # If false, the custom config will just be appended to the configmap. - override: false - # Provide your custom configuration here (overrides IRS Spring application.yaml) - content: - - - env: [] # You can provide your own environment variables for the IRS here. - # - name: JAVA_TOOL_OPTIONS - # - value: -Dhttps.proxyHost=1.2.3.4 - - ####################### - # Minio Configuration # - ####################### - minio: - enabled: true - mode: standalone - persistence: - size: 1Gi - resources: - requests: - memory: 4Gi - rootUser: - rootPassword: - - environment: - MINIO_PROMETHEUS_JOB_ID: minio-actuator - MINIO_PROMETHEUS_URL: http://prometheus:9090 - - ######################### - # Grafana Configuration # - ######################### - grafana: - enabled: false (1) - rbac: - create: false - persistence: - enabled: false - - user: - password: - - admin: - existingSecret: "{{ .Release.Name }}-irs-helm" - userKey: grafanaUser - passwordKey: grafanaPassword - - datasources: - datasources.yaml: - apiVersion: 1 - datasources: - - name: Prometheus - type: prometheus - url: "http://{{ .Release.Name }}-prometheus-server" - isDefault: true - sidecar: - dashboards: - enabled: true - - importDashboards: - minio: dashboards/minio-dashboard.json - outbound: dashboards/irs-outbound-requests.json - irsmonitoring: dashboards/resource-monitoring-dashboard.json - irsjobs: dashboards/irs-jobs-dashboard.json - irsapi: dashboards/irs-api-dashboard.json - - ############################ - # Prometheus Configuration # - ############################ - prometheus: - enabled: false (1) - rbac: - create: false - alertmanager: - enabled: false - prometheus-node-exporter: - enabled: false - kubeStateMetrics: - enabled: false - prometheus-pushgateway: - enabled: false - configmapReload: - prometheus: - enabled: false - - extraScrapeConfigs: | - - job_name: 'spring-actuator' - metrics_path: '/actuator/prometheus' - scrape_interval: 5s - static_configs: - - targets: [ '{{ .Release.Name }}-irs-helm:4004' ] - - - job_name: 'minio-actuator' - metrics_path: /minio/v2/metrics/cluster - static_configs: - - targets: [ '{{ .Release.Name }}-minio:9000' ] -``` - -| **_(1)_** | Use this to enable or disable the monitoring components | -|-----------|---------------------------------------------------------| - -#### Values explained - -##### <irs-url> - -The hostname where the IRS will be made available. - -##### <digital-twin-registry-url> - -The URL of the Digital Twin Registry. The IRS uses this service to fetch AAS shells. - -##### <semantics-hub-url> - -The URL of the SemanticsHub. The IRS uses this service to fetch aspect schemas for payload validation. - -##### <bpdm-url> - -The URL of the BPDM service. The IRS uses this service to fetch business partner information based on BPNs. - -##### <keycloak-token-uri> - -The URL of the Keycloak token API. Used by the IRS for token creation to authenticate with other services. - -##### <keycloak-jwkset-uri> - -The URL of the Keycloak JWK Set. Used by the IRS to validate tokens when the IRS API is called. - -##### <grafana-url> - -The hostname where Grafana will be made available. - -##### <edc-controlplane-endpoint-data> - -The EDC consumer controlplane endpoint URL for data management, including the protocol. -If left empty, this defaults to the internal endpoint of the controlplane provided by the irs-edc-consumer Helm chart. - -#### Semantic Model Provisioning - -The IRS can retrieve semantic models in two ways: - -1. via the Semantic Hub, if you provide the URL - -2. via local schema files - -If you activate both features, IRS will first try to resolve the models via the Hub and use the -local models as a fallback. - -If you want to use local schema files, you need to provide them directly in the `values.yaml` file. Use the -param `semanticsHub.localModels` to specify a map of all the local schemas. -The **key** of each entry is the `Base64` encoded URN of the model. The **value** is the `Base64` encoded content of the -schema file itself. The entries will then be mounted into the IRS container and used on demand. For reference, see the -example comment in the default `values.yaml`. - -### EDC consumer configuration - -If you want to provide your own EDC consumer, add the following entries to your values.yaml: - -```(yaml) - ############################## - # EDC Postgres Configuration # - ############################## - postgresql: - auth: - username: edc - database: edc - postgresPassword: - password: - - ################################## - # EDC Controlplane Configuration # - ################################## - edc-controlplane: - ingresses: - - enabled: true - hostname: "" - annotations: - nginx.ingress.kubernetes.io/ssl-passthrough: "false" - nginx.ingress.kubernetes.io/backend-protocol: "HTTP" - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - endpoints: - - ids - - data - className: "" - tls: - - hosts: - - "" - secretName: tls-secret - certManager: - issuer: "" - clusterIssuer: "" - - edc: - receiver: - callback: - url: "http://{{ .Release.Name }}-irs-helm:8181/internal/endpoint-data-reference" # IRS EDC callback URL, e.g. http://app-irs-helm:8181/internal/endpoint-data-reference - postgresql: - user: edc - password: - transfer: - proxy: - token: - verifier: - publickey: - alias: - signer: - privatekey: - alias: - api: - auth: - key: "" - controlplane: - url: "https://" - dataplane: - url: "https://" - configuration: - properties: |- - edc.oauth.client.id= - edc.oauth.private.key.alias= - edc.oauth.provider.jwks.url= - edc.oauth.public.key.alias= - edc.oauth.token.url= - edc.vault.hashicorp.url= - edc.vault.hashicorp.token= - edc.vault.hashicorp.api.secret.path= - edc.data.encryption.keys.alias= - edc.data.encryption.algorithm=NONE - - ############################### - # EDC Dataplane Configuration # - ############################### - edc-dataplane: - edc: - api: - auth: - key: "" - ## Ingress declaration to expose the network service. - ingresses: - - enabled: true - hostname: "" - annotations: - nginx.ingress.kubernetes.io/ssl-passthrough: "false" - nginx.ingress.kubernetes.io/backend-protocol: "HTTP" - nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - endpoints: - - public - className: "nginx" - tls: - - hosts: - - "" - secretName: tls-secret - certManager: - issuer: "" - clusterIssuer: "" - - configuration: - properties: |- - edc.oauth.client.id= - edc.oauth.private.key.alias= - edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL - edc.oauth.provider.jwks.url= - edc.oauth.public.key.alias= - edc.oauth.token.url= - edc.vault.hashicorp.url= - edc.vault.hashicorp.token= - edc.vault.hashicorp.api.secret.path= -``` - -#### Values explained - -EDC requires a DAPS instance to function correctly. For more information on this, please refer to -the [DAPS](https://github.com/catenax-ng/product-DAPS) or the [EDC](https://github.com/catenax-ng/product-edc) -documentation. - -##### <controlplane-url> - -The hostname where the EDC consumer controlplane will be made available. - -##### <dataplane-url> - -The hostname where the EDC consumer dataplane will be made available. - -##### <vault-url> - -The base URL of the Vault instance. -EDC requires a running instance of HashiCorp Vault to store the DAPS certificate and private key. - -##### <vault-secret-store-path> - -The path to the secret store in Vault where the DAPS certificate and key can be found. -_Example: /v1/team-name_ - -##### <daps-certificate-name> - -The name of the DAPS certificate in the Vault. -_Example: irs-daps-certificate_ - -##### <daps-privatekey-name> - -The name of the DAPS private key in the Vault. -_Example: irs-daps-private-key_ - -##### <daps-client-id> - -The DAPS client ID. - -##### <daps-jwks-url> - -The URL of the DAPS JWK Set. -_Example: [https://daps-hostname/.well-known/jwks.json](https://daps-hostname/.well-known/jwks.json)_ - -##### <daps-token-url> - -The URL of the DAPS token API. -_Example: [https://daps-hostname/token](https://daps-hostname/token)_ - -### Secrets - -This is a list of all secrets used in the deployment. -**_Keep the values for these settings safe and do not publish them!_** - -#### <postgres-admin-password> - -Database password for the **postgres** user. To be defined by you. - -#### <postgres-password> - -Database password for the application user (default username: **edc**). To be defined by you. - -#### <keycloak-client-id> - -Client ID for Keycloak. Request this from your Keycloak operator. - -#### <keycloak-client-secret> - -Client secret for Keycloak. Request this from your Keycloak operator. - -#### <minio-username> - -Login username for Minio. To be defined by you. - -#### <minio-password> - -Login password for Minio. To be defined by you. - -#### <edc-api-key> - -An API key for the EDC API. To be defined by you. - -#### <vault-token> - -The access token for the HashiCorp Vault API. - -#### <grafana-username> - -Login username for Grafana. To be defined by you. - -#### <grafana-password> - -Login password for Grafana. To be defined by you. - +A detailed instruction on how to configure the IRS and EDC can be found here: [Administration Guide](https://eclipse-tractusx.github.io/item-relationship-service/docs/administration/administration-guide.html) From 097df4170c2941a19ac69cb372d2620c9735f8d5 Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Fri, 3 Mar 2023 12:53:23 +0100 Subject: [PATCH 39/44] feat(impl):[TRI-XXX] suppress jakarta from owasp --- ci/owasp-suppressions.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ci/owasp-suppressions.xml b/ci/owasp-suppressions.xml index 3456123411..8d9208bb9d 100644 --- a/ci/owasp-suppressions.xml +++ b/ci/owasp-suppressions.xml @@ -109,4 +109,18 @@ org\.latencyutils.* CVE-2021-4277 + + + jakarta\.activation:jakarta.activation-api.* + CVE-2010-4647 + + + + jakarta\.activation:jakarta.activation-api.* + CVE-2008-7271 + \ No newline at end of file From e6a216fcc05ad54887b046415519efc2e08cd3b4 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Fri, 3 Mar 2023 13:02:51 +0100 Subject: [PATCH 40/44] chore(owasp):[TRI-XXX] Add owasp suppression file to workflow trigger --- .github/workflows/owasp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml index 852bf1ba41..21a31245d8 100644 --- a/.github/workflows/owasp.yml +++ b/.github/workflows/owasp.yml @@ -11,6 +11,7 @@ on: paths: - '**/pom.xml' - 'pom.xml' + - 'ci/owasp-suppressions.xml' schedule: - cron: '0 0 * * *' # Once a day From 6f0a906c392ca9fb359e7546b42d7f57c483f503 Mon Sep 17 00:00:00 2001 From: ds-alexander-bulgakov Date: Mon, 6 Mar 2023 14:07:50 +0100 Subject: [PATCH 41/44] TRI-1149: added execution-ticket to tavern.yml to set execution-ticket for result export --- .github/workflows/tavern.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tavern.yml b/.github/workflows/tavern.yml index f04572d134..687111fcbd 100644 --- a/.github/workflows/tavern.yml +++ b/.github/workflows/tavern.yml @@ -16,6 +16,11 @@ on: description: Global Asset ID to use for the tests default: 'urn:uuid:513d7be8-e7e4-49f4-a22b-8cd31317e454' required: true + execution-ticket: + type: string + description: JIRA execution ticket to safe results in. + default: 'TRI-910' + required: true schedule: - cron: '0 1 * * 1-5' # At 01:00 on every day-of-week from Monday through Friday. @@ -36,7 +41,6 @@ jobs: pip install py pip install tavern pip list - - name: Run tests env: IRS_HOST: ${{ github.event.inputs.irs-host || 'https://irs.int.demo.catena-x.net' }} @@ -46,7 +50,6 @@ jobs: GLOBAL_ASSET_ID: ${{ github.event.inputs.global-asset-id || 'urn:uuid:513d7be8-e7e4-49f4-a22b-8cd31317e454' }} run: | python -m pytest api-tests/irs-api-tests.tavern.yaml --junitxml=tavern-results.xml - - name: Upload results if: always() env: @@ -58,5 +61,4 @@ jobs: curl -H "Content-Type: multipart/form-data" \ -u $JIRA_USERNAME:$JIRA_PASSWORD \ -F 'file=@result.xml' \ - "https://jira.catena-x.net/rest/raven/1.0/import/execution/junit?testExecKey=TRI-910" - + "https://jira.catena-x.net/rest/raven/1.0/import/execution/junit?testExecKey={github.event.inputs.execution-ticket || 'TRI-910'}" \ No newline at end of file From a6ba564aa306e73147083075e437a75cf98f4105 Mon Sep 17 00:00:00 2001 From: ds-alexander-bulgakov Date: Mon, 6 Mar 2023 15:55:05 +0100 Subject: [PATCH 42/44] TRI-1149: set TEST_EXECUTION_TICKET as env, added blank lines --- .github/workflows/tavern.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tavern.yml b/.github/workflows/tavern.yml index 687111fcbd..3f95217fae 100644 --- a/.github/workflows/tavern.yml +++ b/.github/workflows/tavern.yml @@ -41,6 +41,7 @@ jobs: pip install py pip install tavern pip list + - name: Run tests env: IRS_HOST: ${{ github.event.inputs.irs-host || 'https://irs.int.demo.catena-x.net' }} @@ -48,8 +49,10 @@ jobs: KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_ID }} KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_SECRET }} GLOBAL_ASSET_ID: ${{ github.event.inputs.global-asset-id || 'urn:uuid:513d7be8-e7e4-49f4-a22b-8cd31317e454' }} + TEST_EXECUTION_TICKET: ${{ github.event.inputs.execution-ticket || 'TRI-910' }} run: | python -m pytest api-tests/irs-api-tests.tavern.yaml --junitxml=tavern-results.xml + - name: Upload results if: always() env: @@ -61,4 +64,4 @@ jobs: curl -H "Content-Type: multipart/form-data" \ -u $JIRA_USERNAME:$JIRA_PASSWORD \ -F 'file=@result.xml' \ - "https://jira.catena-x.net/rest/raven/1.0/import/execution/junit?testExecKey={github.event.inputs.execution-ticket || 'TRI-910'}" \ No newline at end of file + "https://jira.catena-x.net/rest/raven/1.0/import/execution/junit?testExecKey=$TEST_EXECUTION_TICKET" \ No newline at end of file From 2b836efc616fcb49d44c636f8226022bf9e66632 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 7 Mar 2023 09:16:48 +0100 Subject: [PATCH 43/44] chore(release):[-] Prepare release 2.3.1/5.0.4 --- CHANGELOG.md | 7 ++++++- charts/irs/CHANGELOG.md | 5 +++++ charts/irs/Chart.yaml | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aadcc6084..556bef933b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Known knowns - PLACEHOLDER REMOVE IF EMPTY: risks that were introduced or discovered in the release and are known but not resolved +## [2.3.1] - 2023-03-07 +### Changed +- Updated Spring Boot dependency to 3.0.3 + ## [2.3.0] - 2023-02-21 ### Added - Introduced new endpoint ``/irs/aspectmodels`` which will list all available aspect models (from semantic hub or locally provided files if present) @@ -158,7 +162,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Unresolved - **Select Aspects you need** You are able to select the needed aspects for which you want to collect the correct endpoint information. -[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.3.0...HEAD +[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.3.1...HEAD +[2.3.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.3.0...2.3.1 [2.3.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.2.0...2.3.0 [2.2.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.1.0...2.2.0 [2.1.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/2.0.0...2.1.0 diff --git a/charts/irs/CHANGELOG.md b/charts/irs/CHANGELOG.md index fe15f3c06b..95e223425f 100644 --- a/charts/irs/CHANGELOG.md +++ b/charts/irs/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.0.4] - 2023-03-07 +### Changed +- Update IRS to version 2.3.1 + + ## [5.0.3] - 2023-03-01 ### Fixed - Fixed helm template for bpnEndpoint diff --git a/charts/irs/Chart.yaml b/charts/irs/Chart.yaml index e29597fc91..0e2ff2b133 100644 --- a/charts/irs/Chart.yaml +++ b/charts/irs/Chart.yaml @@ -14,13 +14,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 5.0.3 +version: 5.0.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "2.3.0" +appVersion: "2.3.1" dependencies: - name: common From 5e15a8590e1560a8dc91481ce9203428d5e10120 Mon Sep 17 00:00:00 2001 From: Jan Kreutzfeld Date: Tue, 7 Mar 2023 09:49:12 +0100 Subject: [PATCH 44/44] chore(dependencies):[-] Update DEPENDENCIES list with latest versions --- DEPENDENCIES | 241 ++++++++++++++++++++++++--------------------------- 1 file changed, 114 insertions(+), 127 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 549bc097be..2260849dcf 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,17 +1,18 @@ -maven/mavencentral/ch.qos.logback/logback-classic/1.2.11, EPL-1.0, approved, CQ13636 -maven/mavencentral/ch.qos.logback/logback-core/1.2.11, EPL-1.0, approved, CQ13635 +maven/mavencentral/ch.qos.logback/logback-classic/1.4.5, EPL-1.0 OR LGPL-2.1-only, approved, #3435 +maven/mavencentral/ch.qos.logback/logback-core/1.4.5, EPL-1.0 OR LGPL-2.1-only, approved, #3373 maven/mavencentral/com.carrotsearch.thirdparty/simple-xml-safe/2.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.2, Apache-2.0, approved, CQ24135 -maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.4, Apache-2.0, approved, CQ24135 +maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.1, Apache-2.0, approved, #5303 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.2, Apache-2.0, approved, #2133 -maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.4, Apache-2.0, approved, CQ24134 -maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, CQ24136 +maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.1, Apache-2.0 AND MIT, approved, #4303 +maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, #2134 +maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.1, Apache-2.0, approved, #4105 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.2, Apache-2.0, approved, #2566 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.4, Apache-2.0, approved, #2566 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.4, Apache-2.0, approved, CQ24138 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.4, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.13.4, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, CQ24208 +maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.1, Apache-2.0, approved, #5933 +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.14.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.1, Apache-2.0, approved, #4699 +maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.14.1, Apache-2.0, approved, #5938 +maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.docker-java/docker-java-api/3.2.13, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.2.13, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #3059 maven/mavencentral/com.github.docker-java/docker-java-transport/3.2.13, Apache-2.0, approved, clearlydefined @@ -21,68 +22,61 @@ maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, maven/mavencentral/com.google.errorprone/error_prone_annotations/2.5.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654 maven/mavencentral/com.google.guava/guava/30.1.1-jre, Apache-2.0 AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ23244 -maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, LicenseRef-NONE, approved, #803 +maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657 maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195 maven/mavencentral/com.jayway.jsonpath/json-path/2.7.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.nimbusds/lang-tag/1.6, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.22, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.35, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.24.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.43.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.squareup.okhttp3/okhttp/4.10.0, Apache-2.0 AND MPL-2.0, approved, #3057 maven/mavencentral/com.squareup.okio/okio-jvm/3.0.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.vaadin.external.google/android-json/0.0.20131108.vaadin1, Apache-2.0, approved, CQ21310 maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654 maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385 maven/mavencentral/commons-digester/commons-digester/2.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/commons-fileupload/commons-fileupload/1.4, Apache-2.0, approved, clearlydefined maven/mavencentral/commons-io/commons-io/2.11.0, Apache-2.0, approved, CQ23745 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162 maven/mavencentral/commons-validator/commons-validator/1.7, Apache-2.0, approved, clearlydefined maven/mavencentral/dk.brics.automaton/automaton/1.11-8, BSD-2-Clause, approved, clearlydefined -maven/mavencentral/io.github.classgraph/classgraph/4.8.143, MIT, approved, CQ22530 -maven/mavencentral/io.github.openfeign.form/feign-form-spring/3.8.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.openfeign.form/feign-form/3.8.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.openfeign/feign-core/11.10, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.openfeign/feign-slf4j/11.10, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-annotations/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-bulkhead/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-circuitbreaker/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-consumer/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-core/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-framework-common/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-ratelimiter/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-retry/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-spring-boot2/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-spring/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.github.resilience4j/resilience4j-timelimiter/1.7.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.micrometer/micrometer-core/1.9.5, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.classgraph/classgraph/4.8.149, MIT, approved, CQ22530 +maven/mavencentral/io.github.resilience4j/resilience4j-annotations/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-bulkhead/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-circuitbreaker/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-consumer/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-core/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-framework-common/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-ratelimiter/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-retry/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.github.resilience4j/resilience4j-spring-boot3/2.0.2, Apache-2.0, approved, #7276 +maven/mavencentral/io.github.resilience4j/resilience4j-spring6/2.0.2, Apache-2.0, approved, #7277 +maven/mavencentral/io.github.resilience4j/resilience4j-timelimiter/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.micrometer/micrometer-commons/1.10.3, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.micrometer/micrometer-core/1.10.3, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #6977 +maven/mavencentral/io.micrometer/micrometer-observation/1.10.3, Apache-2.0, approved, clearlydefined maven/mavencentral/io.micrometer/micrometer-registry-prometheus/1.10.0, Apache-2.0, approved, #4721 maven/mavencentral/io.minio/minio/8.4.5, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient/0.16.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient_common/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_common/0.16.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient_tracer_common/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_tracer_common/0.16.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient_tracer_otel/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_tracer_otel/0.16.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.prometheus/simpleclient_tracer_otel_agent/0.15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.prometheus/simpleclient_tracer_otel_agent/0.16.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.7, Apache-2.0, approved, #5947 maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.7, Apache-2.0, approved, #5929 maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.7, Apache-2.0, approved, #5919 maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.swagger/swagger-annotations/1.6.8, Apache-2.0, approved, #3792 -maven/mavencentral/io.vavr/vavr-match/0.10.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.vavr/vavr/0.10.2, Apache-2.0, approved, clearlydefined maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf -maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf -maven/mavencentral/jakarta.annotation/jakarta.annotation-api/1.3.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca -maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, ee4j.bean-validation +maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf +maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca +maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.bean-validation maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.2, BSD-3-Clause, approved, ee4j.jaxb -maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.3, BSD-3-Clause, approved, ee4j.jaxb +maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636 -maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.18, Apache-2.0, approved, #1810 -maven/mavencentral/net.bytebuddy/byte-buddy/1.12.18, Apache-2.0 AND BSD-3-Clause, approved, #1811 +maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.22, Apache-2.0, approved, #1810 +maven/mavencentral/net.bytebuddy/byte-buddy/1.12.22, Apache-2.0 AND BSD-3-Clause, approved, #1811 maven/mavencentral/net.datafaker/datafaker/1.6.0, MIT AND Apache-2.0 AND CC-BY-SA-3.0, approved, #3324 maven/mavencentral/net.java.dev.jna/jna/5.8.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ23217 maven/mavencentral/net.jimblackler.jsonschemafriend/core/0.11.4, Apache-2.0, approved, #3269 @@ -91,110 +85,103 @@ maven/mavencentral/net.jimblackler/jsonschemafriend/0.11.4, Apache-2.0, approved maven/mavencentral/net.minidev/accessors-smart/2.4.8, Apache-2.0, approved, clearlydefined maven/mavencentral/net.minidev/json-smart/2.4.8, Apache-2.0, approved, #3288 maven/mavencentral/org.apache.commons/commons-compress/1.21, Apache-2.0 AND BSD-3-Clause AND bzip2-1.0.6 AND LicenseRef-Public-Domain, approved, CQ23710 +maven/mavencentral/org.apache.commons/commons-compress/1.22, Apache-2.0 AND BSD-3-Clause, approved, #4299 maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.apache.logging.log4j/log4j-api/2.17.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.apache.logging.log4j/log4j-core/2.17.2, Apache-2.0, approved, #2168 -maven/mavencentral/org.apache.logging.log4j/log4j-jul/2.17.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.apache.logging.log4j/log4j-slf4j-impl/2.17.2, Apache-2.0, approved, #2537 -maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.17.2, Apache-2.0, approved, #2163 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.68, , approved, CQ20188 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.68, Apache-2.0, approved, CQ20193 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.68, Apache-2.0, approved, CQ20194 +maven/mavencentral/org.apache.logging.log4j/log4j-api/2.19.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.apache.logging.log4j/log4j-core/2.19.0, Apache-2.0 AND (Apache-2.0 AND LGPL-2.0-or-later), approved, #5009 +maven/mavencentral/org.apache.logging.log4j/log4j-jul/2.19.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.apache.logging.log4j/log4j-slf4j2-impl/2.19.0, Apache-2.0, approved, #7278 +maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.19.0, Apache-2.0, approved, #5941 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.5, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.5, Apache-2.0, approved, #6997 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.5, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.aspectj/aspectjweaver/1.9.7, EPL-1.0, approved, tools.aspectj -maven/mavencentral/org.assertj/assertj-core/3.22.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.69, MIT, approved, clearlydefined +maven/mavencentral/org.aspectj/aspectjweaver/1.9.19, EPL-1.0, approved, tools.aspectj +maven/mavencentral/org.assertj/assertj-core/3.23.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.69, MIT, approved, clearlydefined -maven/mavencentral/org.bouncycastle/bcutil-jdk15on/1.69, MIT, approved, clearlydefined maven/mavencentral/org.checkerframework/checker-qual/3.8.0, MIT, approved, clearlydefined maven/mavencentral/org.eclipse.dataspaceconnector/catalog-spi/0.0.1-milestone-6, Apache-2.0, approved, #5191 maven/mavencentral/org.eclipse.dataspaceconnector/contract-spi/0.0.1-milestone-6, Apache-2.0, approved, #5190 maven/mavencentral/org.eclipse.dataspaceconnector/core-spi/0.0.1-milestone-6, Apache-2.0, approved, #5189 maven/mavencentral/org.eclipse.dataspaceconnector/policy-evaluator/0.0.1-milestone-6, Apache-2.0, approved, #5188 maven/mavencentral/org.eclipse.dataspaceconnector/policy-spi/0.0.1-milestone-6, Apache-2.0, approved, #5192 -maven/mavencentral/org.eclipse.tractusx.irs/irs-api/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-models/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-api/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-models/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, CQ23997 -maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, , approved, CQ13192 -maven/mavencentral/org.hibernate.validator/hibernate-validator/6.2.5.Final, Apache-2.0, approved, CQ23258 +maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined +maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.0.Final, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jboss.logging/jboss-logging/3.4.1.Final, Apache-2.0, approved, CQ21255 -maven/mavencentral/org.jboss.logging/jboss-logging/3.4.3.Final, Apache-2.0, approved, CQ21255 +maven/mavencentral/org.jboss.logging/jboss-logging/3.5.0.Final, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.21, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.7.22, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.5.31, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.21, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.7.22, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.5.31, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.21, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.7.22, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.20, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.21, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.7.22, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains/annotations/15.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jsoup/jsoup/1.15.3, MIT, approved, #3272 -maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.8.2, EPL-2.0, approved, #1291 -maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.8.2, EPL-2.0, approved, #1488 -maven/mavencentral/org.junit.jupiter/junit-jupiter/5.8.2, EPL-2.0, approved, clearlydefined -maven/mavencentral/org.junit.platform/junit-platform-commons/1.8.2, EPL-2.0, approved, #1288 -maven/mavencentral/org.mockito/mockito-core/4.5.1, MIT AND Apache-2.0, approved, CQ24117 -maven/mavencentral/org.mockito/mockito-junit-jupiter/4.5.1, MIT, approved, clearlydefined +maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.2, EPL-2.0, approved, #3133 +maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.2, EPL-2.0, approved, #3134 +maven/mavencentral/org.junit.jupiter/junit-jupiter/5.9.2, EPL-2.0, approved, #6972 +maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.2, EPL-2.0, approved, #3130 +maven/mavencentral/org.mockito/mockito-core/4.8.1, MIT, approved, clearlydefined +maven/mavencentral/org.mockito/mockito-junit-jupiter/4.8.1, MIT, approved, clearlydefined maven/mavencentral/org.opentest4j/opentest4j/1.2.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.ow2.asm/asm/9.1, BSD-3-Clause, approved, CQ23029 -maven/mavencentral/org.ow2.asm/asm/9.4, BSD-3-Clause, approved, CQ24269 maven/mavencentral/org.projectlombok/lombok/1.18.24, MIT AND LicenseRef-Public-Domain, approved, CQ23907 maven/mavencentral/org.rnorth.duct-tape/duct-tape/1.0.8, MIT, approved, clearlydefined maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.slf4j/jul-to-slf4j/1.7.36, MIT, approved, CQ12842 -maven/mavencentral/org.slf4j/slf4j-api/1.7.32, MIT, approved, CQ13368 -maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368 +maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.6, MIT, approved, clearlydefined +maven/mavencentral/org.slf4j/slf4j-api/2.0.2, MIT, approved, #5915 +maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915 maven/mavencentral/org.springdoc/springdoc-openapi-common/1.6.7, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springdoc/springdoc-openapi-ui/1.6.7, Apache-2.0, approved, #4347 -maven/mavencentral/org.springdoc/springdoc-openapi-webmvc-core/1.6.7, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/2.7.5, Apache-2.0, approved, #3273 -maven/mavencentral/org.springframework.boot/spring-boot-actuator/2.7.5, Apache-2.0, approved, #4316 -maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.5, Apache-2.0, approved, #4314 -maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/2.7.5, Apache-2.0, approved, #4318 -maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/2.7.5, Apache-2.0, approved, #4310 -maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.5, Apache-2.0, approved, #4307 -maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/2.7.5, Apache-2.0, approved, #4311 -maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.5, Apache-2.0, approved, #4327 -maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/2.7.5, Apache-2.0, approved, #4312 -maven/mavencentral/org.springframework.boot/spring-boot-starter-security/2.7.5, Apache-2.0, approved, #4309 -maven/mavencentral/org.springframework.boot/spring-boot-starter-test/2.7.5, Apache-2.0, approved, #4320 -maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/2.7.5, Apache-2.0, approved, #4305 -maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/2.7.5, Apache-2.0, approved, #4321 -maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.5, Apache-2.0, approved, #4304 -maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.5, Apache-2.0, approved, #4308 -maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/2.7.5, Apache-2.0, approved, #4313 -maven/mavencentral/org.springframework.boot/spring-boot-test/2.7.5, Apache-2.0, approved, #4323 -maven/mavencentral/org.springframework.boot/spring-boot/2.7.5, Apache-2.0, approved, #4322 -maven/mavencentral/org.springframework.cloud/spring-cloud-commons/3.1.5, Apache-2.0, approved, #4726 -maven/mavencentral/org.springframework.cloud/spring-cloud-context/3.1.5, Apache-2.0, approved, #4722 -maven/mavencentral/org.springframework.cloud/spring-cloud-openfeign-core/3.1.5, Apache-2.0, approved, #4724 -maven/mavencentral/org.springframework.cloud/spring-cloud-starter-openfeign/3.1.5, Apache-2.0, approved, #4725 -maven/mavencentral/org.springframework.cloud/spring-cloud-starter/3.1.5, Apache-2.0, approved, #4723 -maven/mavencentral/org.springframework.data/spring-data-commons/2.7.5, Apache-2.0, approved, #2768 -maven/mavencentral/org.springframework.security/spring-security-config/5.7.5, Apache-2.0, approved, #4315 -maven/mavencentral/org.springframework.security/spring-security-core/5.7.5, Apache-2.0, approved, #4269 -maven/mavencentral/org.springframework.security/spring-security-crypto/5.7.5, Apache-2.0 AND ISC, approved, #4268 -maven/mavencentral/org.springframework.security/spring-security-oauth2-client/5.7.5, Apache-2.0, approved, #4326 -maven/mavencentral/org.springframework.security/spring-security-oauth2-core/5.7.5, Apache-2.0, approved, #4325 -maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/5.7.5, Apache-2.0, approved, #4317 -maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/5.7.5, Apache-2.0, approved, #4306 -maven/mavencentral/org.springframework.security/spring-security-rsa/1.0.11.RELEASE, Apache-2.0, approved, CQ20647 -maven/mavencentral/org.springframework.security/spring-security-web/5.7.5, Apache-2.0, approved, #4319 -maven/mavencentral/org.springframework/spring-aop/5.3.23, Apache-2.0, approved, CQ24237 -maven/mavencentral/org.springframework/spring-beans/5.3.23, Apache-2.0, approved, CQ24234 -maven/mavencentral/org.springframework/spring-context/5.3.23, Apache-2.0, approved, CQ24233 -maven/mavencentral/org.springframework/spring-core/5.3.23, Apache-2.0 AND BSD-3-Clause, approved, CQ24026 -maven/mavencentral/org.springframework/spring-expression/5.3.23, Apache-2.0, approved, CQ23155 -maven/mavencentral/org.springframework/spring-jcl/5.3.23, Apache-2.0, approved, CQ23156 -maven/mavencentral/org.springframework/spring-test/5.3.23, Apache-2.0, approved, CQ23054 -maven/mavencentral/org.springframework/spring-web/5.3.23, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ24028 -maven/mavencentral/org.springframework/spring-webmvc/5.3.23, Apache-2.0, approved, CQ23158 -maven/mavencentral/org.testcontainers/junit-jupiter/1.17.5, MIT, approved, clearlydefined -maven/mavencentral/org.testcontainers/testcontainers/1.17.5, MIT, approved, #3074 -maven/mavencentral/org.webjars/swagger-ui/4.10.3, Apache-2.0 AND (BSD-3-Clause AND MIT) AND MIT, approved, #3060 -maven/mavencentral/org.webjars/webjars-locator-core/0.50, MIT, approved, clearlydefined +maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.0.2, Apache-2.0, approved, #5920 +maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.0.2, Apache-2.0, approved, #5950 +maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.0.2, Apache-2.0, approved, #5923 +maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.0.2, Apache-2.0, approved, #6981 +maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/3.0.2, Apache-2.0, approved, #6983 +maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/3.0.2, Apache-2.0, approved, #6965 +maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.0.2, Apache-2.0, approved, #7006 +maven/mavencentral/org.springframework.boot/spring-boot-starter-log4j2/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.0.2, Apache-2.0, approved, #6982 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.0.2, Apache-2.0, approved, #5932 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/3.0.2, Apache-2.0, approved, #6967 +maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.0.2, Apache-2.0, approved, #7001 +maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.0.2, Apache-2.0, approved, #6987 +maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.0.2, Apache-2.0, approved, #6971 +maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.0.2, Apache-2.0, approved, #5945 +maven/mavencentral/org.springframework.boot/spring-boot-starter/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.0.2, Apache-2.0, approved, #6966 +maven/mavencentral/org.springframework.boot/spring-boot-test/3.0.2, Apache-2.0, approved, #6976 +maven/mavencentral/org.springframework.boot/spring-boot/3.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.data/spring-data-commons/3.0.1, Apache-2.0, approved, #5943 +maven/mavencentral/org.springframework.security/spring-security-config/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-core/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-crypto/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.0.1, Apache-2.0, approved, #5931 +maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-web/6.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework/spring-aop/6.0.4, Apache-2.0, approved, #5940 +maven/mavencentral/org.springframework/spring-beans/6.0.4, Apache-2.0, approved, #5937 +maven/mavencentral/org.springframework/spring-context/6.0.4, Apache-2.0, approved, #5936 +maven/mavencentral/org.springframework/spring-core/6.0.4, Apache-2.0 AND BSD-3-Clause, approved, #5948 +maven/mavencentral/org.springframework/spring-expression/6.0.4, Apache-2.0, approved, #3284 +maven/mavencentral/org.springframework/spring-jcl/6.0.4, Apache-2.0, approved, #3283 +maven/mavencentral/org.springframework/spring-test/6.0.4, Apache-2.0, approved, #7003 +maven/mavencentral/org.springframework/spring-web/6.0.4, Apache-2.0, approved, #5942 +maven/mavencentral/org.springframework/spring-webmvc/6.0.4, Apache-2.0, approved, #5944 +maven/mavencentral/org.testcontainers/junit-jupiter/1.17.6, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/testcontainers/1.17.6, MIT, approved, #3074 +maven/mavencentral/org.webjars/swagger-ui/4.15.5, Apache-2.0 AND MIT, approved, #5921 +maven/mavencentral/org.webjars/webjars-locator-core/0.52, MIT, approved, clearlydefined maven/mavencentral/org.xerial.snappy/snappy-java/1.1.8.4, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.xmlunit/xmlunit-core/2.9.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272 maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined