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

CP 7.0 - Bug#13084: remove vitam common-private library references and use common-public #1952

Merged
merged 1 commit into from
Dec 4, 2024
Merged

CP 7.0 - Bug#13084: remove vitam common-private library references and use common-public #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions api/api-iam/iam-internal/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>fr.gouv.vitam</groupId>
<artifactId>common-private</artifactId>
</dependency>


<!-- Apereo CAS Server Core Api Ticket -->
<dependency>
Expand Down
9 changes: 0 additions & 9 deletions ...c/main/java/fr/gouv/vitamui/iam/internal/server/user/service/UserInfoInternalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;

import javax.transaction.Transactional;
Expand Down Expand Up @@ -194,12 +193,4 @@ protected void beforeCreate(final UserInfoDto dto) {

dto.setIdentifier(getNextSequenceId(SequencesConstants.USER_INFOS_IDENTIFIER));
}

private UserInfo find(final String id, final String message) {
Assert.isTrue(StringUtils.isNotEmpty(id), message + ": no id");

return getRepository()
.findById(id)
.orElseThrow(() -> new IllegalArgumentException(message + ": no user info found for id " + id));
}
}
5 changes: 1 addition & 4 deletions commons/commons-logbook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>fr.gouv.vitam</groupId>
<artifactId>common-private</artifactId>
</dependency>

<dependency>
<groupId>fr.gouv.vitam</groupId>
<artifactId>common-public</artifactId>
Expand Down
24 changes: 1 addition & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,29 +868,7 @@
<artifactId>common-database-public</artifactId>
<version>${vitam.version}</version>
</dependency>
<dependency>
<groupId>fr.gouv.vitam</groupId>
<artifactId>common-private</artifactId>
<version>${vitam.version}</version>
<exclusions>
<exclusion>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_common</artifactId>
</exclusion>
<exclusion>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_dropwizard</artifactId>
</exclusion>
<exclusion>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_hotspot</artifactId>
</exclusion>
<exclusion>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>fr.gouv.vitam</groupId>
<artifactId>logbook-common</artifactId>
Expand Down
Loading