Skip to content
Snippets Groups Projects
Commit 933a7d9a authored by Isha Kumari's avatar Isha Kumari
Browse files

fixed conflict

parent d4f291d5
No related branches found
No related tags found
1 merge request!655Jakarta EE, Spring 6, Spring-Boot 3 migration
Pipeline #271184 failed
......@@ -17,7 +17,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import org.opengroup.osdu.core.aws.sns.AmazonSNSConfig;
import org.opengroup.osdu.core.aws.sns.PublishRequestBuilder;
......
......@@ -22,7 +22,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import org.apache.http.HttpStatus;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment