Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 88d043c3 authored by Marco Amoia's avatar Marco Amoia
Browse files

Merge branch 'release' into 'main'

Release

See merge request !212
parents b846e176 87faa74d
No related branches found
No related tags found
2 merge requests!213Update version to 1.2.0,!212Release
Pipeline #270519 failed
Showing
with 732 additions and 5 deletions
PROJECT_VERSION_NUMBER="1.0.1"
PROJECT_VERSION_NUMBER="1.1.0"
......@@ -7,17 +7,17 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>eu.europa.ec.simpl</groupId>
<artifactId>simpl-parent</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
<packaging>pom</packaging>
<properties>
<common.version>1.0.1</common.version>
<common.version>1.1.0</common.version>
<java.version>21</java.version>
<spring-cloud.version>2024.0.0</spring-cloud.version>
<mapstruct.version>1.6.3</mapstruct.version>
......@@ -35,18 +35,31 @@
<nimbus.version>9.47</nimbus.version>
<spring-statemachine-core.version>4.0.0</spring-statemachine-core.version>
<tika-core.version>3.0.0</tika-core.version>
<commons-text.version>1.13.0</commons-text.version>
<shedlock-spring>6.0.2</shedlock-spring>
<swagger-core.version>2.2.27</swagger-core.version>
<swagger-parser.version>2.1.24</swagger-parser.version>
</properties>
<modules>
<module>simpl-spring-boot-starter</module>
<module>simpl-test-lib</module>
<module>simpl-commons-data</module>
<module>simpl-api-iaa</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
<version>${swagger-core.version}</version>
</dependency>
<dependency>
<groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId>
<version>${swagger-parser.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
......@@ -67,6 +80,11 @@
<artifactId>simpl-commons-data</artifactId>
<version>${common.version}</version>
</dependency>
<dependency>
<groupId>eu.europa.ec.simpl</groupId>
<artifactId>simpl-api-iaa</artifactId>
<version>${common.version}</version>
</dependency>
<dependency>
<groupId>eu.europa.ec.simpl</groupId>
<artifactId>simpl-test-lib</artifactId>
......@@ -173,6 +191,11 @@
<artifactId>tika-core</artifactId>
<version>${tika-core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons-text.version}</version>
</dependency>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-spring</artifactId>
......
This diff is collapsed.
package eu.europa.ec.simpl.api.authenticationprovider.v1.model;
import jakarta.validation.constraints.NotBlank;
public interface DistinguishedName {
@NotBlank
String getCommonName();
@NotBlank
String getOrganization();
@NotBlank
String getOrganizationalUnit();
@NotBlank
String getCountry();
}
package eu.europa.ec.simpl.api.authenticationprovider.v1.model;
import jakarta.validation.constraints.NotBlank;
public interface ImportKeyPair {
@NotBlank
String getPublicKey();
@NotBlank
String getPrivateKey();
}
package eu.europa.ec.simpl.api.authenticationprovider.v1.model;
public interface KeyPair {
byte[] getPublicKey();
byte[] getPrivateKey();
}
package eu.europa.ec.simpl.api.identityprovider.v1.model;
import java.time.Instant;
public interface Certificate {
String getPublicKey();
Instant getExpiryDate();
}
package eu.europa.ec.simpl.api.identityprovider.v1.model;
import jakarta.validation.constraints.NotBlank;
import java.time.Instant;
import java.util.UUID;
public interface Participant {
UUID getId();
@NotBlank
String getParticipantType();
@NotBlank
String getOrganization();
Instant getCreationTimestamp();
Instant getUpdateTimestamp();
String getCredentialId();
Instant getExpiryDate();
}
package eu.europa.ec.simpl.api.identityprovider.v1.model;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import eu.europa.ec.simpl.api.securityattributesprovider.v1.model.IdentityAttribute;
import jakarta.validation.Valid;
import java.util.List;
public interface ParticipantWithIdentityAttributes {
@Valid
@JsonUnwrapped
Participant getParticipant();
List<? extends IdentityAttribute> getIdentityAttributes();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import java.util.List;
import java.util.UUID;
public interface Approve {
List<UUID> getIdentityAttributes();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import java.time.Instant;
import java.util.UUID;
public interface Comment {
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
UUID getId();
@NotBlank
String getAuthor();
@NotBlank
@Size(max = 5000)
String getContent();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getCreationTimestamp();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getUpdateTimestamp();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.time.Instant;
import java.util.UUID;
public interface Document {
UUID getId();
DocumentTemplate getDocumentTemplate();
MimeType getMimeType();
String getDescription();
String getFilename();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Long getFilesize();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getCreationTimestamp();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getUpdateTimestamp();
String getContent();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.time.Instant;
import java.util.UUID;
public interface DocumentTemplate {
UUID getId();
@NotBlank
String getDescription();
@NotNull Boolean getMandatory();
@NotNull MimeType getMimeType();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getCreationTimestamp();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getUpdateTimestamp();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import jakarta.validation.constraints.NotBlank;
import java.util.UUID;
public interface MimeType {
UUID getId();
@NotBlank
String getValue();
@NotBlank
String getDescription();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
public interface OnboardingApplicant {
@NotBlank
String getUsername();
@NotBlank
String getFirstName();
@NotBlank
String getLastName();
@NotBlank
String getEmail();
@NotBlank
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
String getPassword();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
import java.time.Instant;
import java.util.List;
import java.util.UUID;
public interface OnboardingRequest {
UUID getId();
UUID getParticipantId();
OnboardingStatus getStatus();
@NotNull OnboardingApplicant getApplicant();
@NotNull ParticipantType getParticipantType();
@NotNull String getOrganization();
List<? extends Document> getDocuments();
List<? extends Comment> getComments();
String getRejectionCause();
Long getExpirationTimeframe();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getCreationTimestamp();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getUpdateTimestamp();
Instant getLastParticipantUpdateTimestamp();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import java.util.UUID;
public interface OnboardingStatus {
UUID getId();
@NotBlank
@Size(max = 255)
String getLabel();
@NotBlank
@Size(max = 255)
OnboardingStatusValueDTO getValue();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.time.Instant;
import java.util.List;
import java.util.UUID;
public interface OnboardingTemplate {
UUID getId();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
ParticipantType getParticipantType();
@NotBlank
String getDescription();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getCreationTimestamp();
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
Instant getUpdateTimestamp();
@Valid
List<? extends DocumentTemplate> getDocumentTemplates();
@NotNull Long getExpirationTimeframe();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import java.util.UUID;
public interface ParticipantType {
UUID getId();
String getValue();
String getLabel();
}
package eu.europa.ec.simpl.api.onboarding.v1.model;
import jakarta.validation.constraints.NotNull;
public interface Reject {
@NotNull String getRejectionCause();
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment