Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Migrate to EDC 0.7.0 #359

Merged
merged 26 commits into from
May 21, 2024
Merged

Chore: Migrate to EDC 0.7.0 #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bcb04e8
chore(Tractusx-Edc): bump version to 0.7.1
tom-rm-meyer-ISST May 15, 2024
d3dd47c
chore(edc-0.7.0): migrated backend to version 0.7.0
tom-rm-meyer-ISST May 6, 2024
8575873
feat(EdcAdapterService): terminate transfers
tom-rm-meyer-ISST May 7, 2024
411435c
feat: updated edc request and frontend to edc 0.7.0
tom-rm-meyer-ISST May 7, 2024
d1c0b52
feat(EdcRequestBodyBuilder): adjust context for policy creation and a…
tom-rm-meyer-ISST May 8, 2024
50b346c
fix(EdcAdapterService): use dspUrl of the SubmodelDescriptor for nego…
tom-rm-meyer-ISST May 8, 2024
ca2465b
fix(EdcAdapterService): check constraints for >=1 submodel offers and…
tom-rm-meyer-ISST May 8, 2024
7b2aed1
feat(EdcRequestBodyBuilder): introduced cx-policy framework agreement…
tom-rm-meyer-ISST May 8, 2024
4e36df9
chore(chart): increased chart version
tom-rm-meyer-ISST May 8, 2024
76719e2
feat(EdcAdapterService): introduced cx-policy usage purpose policy
tom-rm-meyer-ISST May 10, 2024
cd17779
refactor(EdcRequestBodyBuilder): make PolicyConstraintDto a private r…
tom-rm-meyer-ISST May 14, 2024
517a2c7
refactor(EdcAdapterService): improved null value handling
tom-rm-meyer-ISST May 14, 2024
65178bc
refactor(EdcAdapterService): remove storing of edr and expiry check
tom-rm-meyer-ISST May 15, 2024
fbf0831
Revert "chore(Tractusx-Edc): bump version to 0.7.1"
tom-rm-meyer-ISST May 15, 2024
6d63c8d
Merge branch 'main' into chore/edc-0.7.0
tom-rm-meyer-ISST May 15, 2024
3a71a70
chore: updated frontend dependencies
tom-rm-meyer-ISST May 15, 2024
67d2935
Merge branch 'chore/edc-0.7.0-infra' into chore/edc-0.7.0
tom-rm-meyer-ISST May 16, 2024
22407ab
fix(FrameworkAgreementCredential): made the config uppercase
tom-rm-meyer-ISST May 16, 2024
169923e
chore(docker-compose-infrastructure.yaml): outcomment unused MIW
tom-rm-meyer-ISST May 16, 2024
a646855
chore: removed solved todos
tom-rm-meyer-ISST May 16, 2024
1764ce4
Merge branch 'main' into chore/edc-0.7.0
tom-rm-meyer-ISST May 16, 2024
fda877e
docs(local/INSTALL.md): fixed bdrs typo
tom-rm-meyer-ISST May 16, 2024
45138df
Merge branch 'main' into chore/edc-0.7.0
tom-rm-meyer-ISST May 17, 2024
886393a
chore: bump chart version to 2.4.0
tom-rm-meyer-ISST May 17, 2024
8b608a5
fix(helm): updated partner ownSites endpoint to partner endpoint
tom-rm-meyer-ISST May 19, 2024
c9691a4
Merge branch 'main' into chore/edc-0.7.0
tom-rm-meyer-ISST May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
359 changes: 180 additions & 179 deletions backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2022,2023 Volkswagen AG
Copyright (c) 2022,2023 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. (represented by Fraunhofer ISST)
Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
Copyright (c) 2022,2024 Volkswagen AG
Copyright (c) 2022,2024 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. (represented by Fraunhofer ISST)
Copyright (c) 2022,2024 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.
Expand All @@ -24,182 +24,183 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.2</version>
<relativePath/>
</parent>
<groupId>org.eclipse.tractusx.puris</groupId>
<artifactId>puris-backend</artifactId>
<version>1.0.0</version>
<name>puris-backend</name>
<description>PURIS Backend</description>
<properties>
<java.version>17</java.version>
<springdoc.version>2.3.0</springdoc.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<snakeyaml.version>2.2</snakeyaml.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-core</artifactId>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.7.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.modelmapper/modelmapper -->
<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
<version>3.2.0</version>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.2</version>
<relativePath/>
</parent>
<groupId>org.eclipse.tractusx.puris</groupId>
<artifactId>puris-backend</artifactId>
<version>1.0.0</version>
<name>puris-backend</name>
<description>PURIS Backend</description>
<properties>
<java.version>17</java.version>
<springdoc.version>2.3.0</springdoc.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<snakeyaml.version>2.2</snakeyaml.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-core</artifactId>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.7.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.modelmapper/modelmapper -->
<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
<version>3.2.0</version>
</dependency>

<pluginRepositories>
<pluginRepository>
<id>dash-licenses</id>
<url>https://repo.eclipse.org/content/repositories/dash-licenses</url>
</pluginRepository>
</pluginRepositories>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
<version>1.0.2</version>
<configuration>
<projectId>automotive.tractusx</projectId>
<!-- name of dependencies file -->
<summary>DEPENDENCIES</summary>
<!-- include test dependencies -->
<includeScope>test</includeScope>
</configuration>
<executions>
<execution>
<id>license-check</id>
<goals>
<goal>license-check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
<!-- keep for testing purposes, but exclude for security reasons -->
<exclude>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.2</version>
<configuration>
<licenseSets>
<licenseSet>
<header>scripts/license/header.txt</header>
<excludes>
<exclude>**/README</exclude>
<exclude>src/test/resources/**</exclude>
<exclude>src/main/resources/**</exclude>
</excludes>
</licenseSet>
</licenseSets>
</configuration>
</plugin>
</plugins>
<resources>
<!-- add basic application properties -->
<resource>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>application.properties</include>
</includes>
<targetPath>BOOT-INF/classes/</targetPath>
</resource>
<!-- add legal information to META-INF -->
<resource>
<directory>${project.basedir}/</directory>
<includes>
<include>README.md</include>
<include>LICENSE</include>
<include>NOTICE.md</include>
<include>DEPENDENCIES</include>
<include>SECURITY.md</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
</resources>
</build>
<pluginRepositories>
<pluginRepository>
<id>dash-licenses</id>
<url>https://repo.eclipse.org/content/repositories/dash-licenses</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
<version>1.0.2</version>
<configuration>
<projectId>automotive.tractusx</projectId>
<!-- name of dependencies file -->
<summary>DEPENDENCIES</summary>
<!-- include test dependencies -->
<includeScope>test</includeScope>
</configuration>
<executions>
<execution>
<id>license-check</id>
<goals>
<goal>license-check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
<!-- keep for testing purposes, but exclude for security reasons -->
<exclude>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.2</version>
<configuration>
<licenseSets>
<licenseSet>
<header>scripts/license/header.txt</header>
<excludes>
<exclude>**/README</exclude>
<exclude>src/test/resources/**</exclude>
<exclude>src/main/resources/**</exclude>
</excludes>
</licenseSet>
</licenseSets>
</configuration>
</plugin>
</plugins>
<resources>
<!-- add basic application properties -->
<resource>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>application.properties</include>
</includes>
<targetPath>BOOT-INF/classes/</targetPath>
</resource>
<!-- add legal information to META-INF -->
<resource>
<directory>${project.basedir}/</directory>
<includes>
<include>README.md</include>
<include>LICENSE</include>
<include>NOTICE.md</include>
<include>DEPENDENCIES</include>
<include>SECURITY.md</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
</resources>
</build>
</project>
Loading
Loading